Michael Niedermayer 17085a0251 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@gmx.at>

2014-10-15 15:49:31 +02:00

7.5 KiB

Raw Blame History

View Raw