Merge commit '874390e163427c1fe7682ab27924a7843780dbb3'

* commit '874390e163427c1fe7682ab27924a7843780dbb3':
  lavc: add a convenience function for rescaling timestamps in a packet

Conflicts:
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc doc/APIchanges
Simple merge

diff --cc libavcodec/avcodec.h
Simple merge

diff --cc libavcodec/avpacket.c
index 959d95963a331363d8a5754d21152b9d0dc01370,25eabdb215532813f83e3751d0ece22946e72dfe..a87e8e3eade035f28ed051514188c58919820e4e
--- 1/libavcodec/avpacket.c
--- 2/libavcodec/avpacket.c
+++ b/libavcodec/avpacket.c
@@@ -24,11 -24,9 +24,12 @@@
  #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)

diff --cc libavcodec/version.h
index af19be280aa4a65baced6118494ea06a5117fcf9,dee6615d1747d326bf2b5be7134c4adcd73c8235..f2c4e4856b3f8ffafec4526baf6bfae8589ff73b
--- 1/libavcodec/version.h
--- 2/libavcodec/version.h
+++ b/libavcodec/version.h
@@@ -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, \