Merge commit '874390e163427c1fe7682ab27924a7843780dbb3'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 20 Jun 2014 14:40:04 +0000 (16:40 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 20 Jun 2014 14:40:04 +0000 (16:40 +0200)
* commit '874390e163427c1fe7682ab27924a7843780dbb3':
  lavc: add a convenience function for rescaling timestamps in a packet

Conflicts:
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
doc/APIchanges
libavcodec/avcodec.h
libavcodec/avpacket.c
libavcodec/version.h

diff --cc doc/APIchanges
Simple merge
Simple merge
  #include "libavutil/avassert.h"
  #include "libavutil/common.h"
  #include "libavutil/internal.h"
+ #include "libavutil/mathematics.h"
  #include "libavutil/mem.h"
  #include "avcodec.h"
 +#include "bytestream.h"
 +#include "internal.h"
 +
  #if FF_API_DESTRUCT_PACKET
  
  void av_destruct_packet(AVPacket *pkt)
@@@ -29,8 -29,8 +29,8 @@@
  #include "libavutil/version.h"
  
  #define LIBAVCODEC_VERSION_MAJOR 55
- #define LIBAVCODEC_VERSION_MINOR  67
 -#define LIBAVCODEC_VERSION_MINOR 55
 -#define LIBAVCODEC_VERSION_MICRO  0
++#define LIBAVCODEC_VERSION_MINOR  68
 +#define LIBAVCODEC_VERSION_MICRO 100
  
  #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
                                                 LIBAVCODEC_VERSION_MINOR, \