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/cavsdec.c | |
parent | 51c810e62b63a1451b337b1cba0141b386066668 (diff) | |
parent | 7ea1b3472a61de4aa4d41b571e99418e4997ad41 (diff) | |
download | ffmpeg-streaming-17085a0251a1493f6447aa3d2ee06fda2c9402f0.zip ffmpeg-streaming-17085a0251a1493f6447aa3d2ee06fda2c9402f0.tar.gz |
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/cavsdec.c')
-rw-r--r-- | libavcodec/cavsdec.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/cavsdec.c b/libavcodec/cavsdec.c index 34b65e6..42306cc 100644 --- a/libavcodec/cavsdec.c +++ b/libavcodec/cavsdec.c @@ -1147,8 +1147,7 @@ static int decode_seq_header(AVSContext *h) h->low_delay = get_bits1(&h->gb); h->mb_width = (h->width + 15) >> 4; h->mb_height = (h->height + 15) >> 4; - h->avctx->time_base.den = ff_mpeg12_frame_rate_tab[frame_rate_code].num; - h->avctx->time_base.num = ff_mpeg12_frame_rate_tab[frame_rate_code].den; + h->avctx->framerate = ff_mpeg12_frame_rate_tab[frame_rate_code]; h->avctx->width = h->width; h->avctx->height = h->height; if (!h->top_qp) |