diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-15 13:38:10 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-15 15:49:31 +0200 |
| commit | 17085a0251a1493f6447aa3d2ee06fda2c9402f0 (patch) | |
| tree | d627e3d5bdcf01ed711249c30247c74dd7087367 /libavcodec/eamad.c | |
| parent | 51c810e62b63a1451b337b1cba0141b386066668 (diff) | |
| parent | 7ea1b3472a61de4aa4d41b571e99418e4997ad41 (diff) | |
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>
Diffstat (limited to 'libavcodec/eamad.c')
| -rw-r--r-- | libavcodec/eamad.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/eamad.c b/libavcodec/eamad.c index c768b9361e..813a2d1cdb 100644 --- a/libavcodec/eamad.c +++ b/libavcodec/eamad.c @@ -257,7 +257,7 @@ static int decode_frame(AVCodecContext *avctx, inter = (chunk_type == MADm_TAG || chunk_type == MADe_TAG); bytestream2_skip(&gb, 10); - av_reduce(&avctx->time_base.num, &avctx->time_base.den, + av_reduce(&avctx->framerate.den, &avctx->framerate.num, bytestream2_get_le16(&gb), 1000, 1<<30); width = bytestream2_get_le16(&gb); |