[FFmpeg-cvslog] Merge commit '7ea1b3472a61de4aa4d41b571e99418e4997ad41'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Oct 15 13:38:10 2014 +0200| [17085a0251a1493f6447aa3d2ee06fda2c9402f0] | committer: Michael Niedermayer

Merge commit '7ea1b3472a61de4aa4d41b571e99418e4997ad41'

* commit '7ea1b3472a61de4aa4d41b571e99418e4997ad41':
  lavc: deprecate the use of AVCodecContext.time_base for decoding

Conflicts:
	libavcodec/avcodec.h
	libavcodec/h264.c
	libavcodec/mpegvideo_parser.c
	libavcodec/utils.c
	libavcodec/version.h

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=17085a0251a1493f6447aa3d2ee06fda2c9402f0
---