diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-15 15:38:10 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-15 17:49:31 +0400 |
commit | 17085a0251a1493f6447aa3d2ee06fda2c9402f0 (patch) | |
tree | d627e3d5bdcf01ed711249c30247c74dd7087367 /libavcodec/dirac.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/dirac.c')
-rw-r--r-- | libavcodec/dirac.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/dirac.c b/libavcodec/dirac.c index c1f69372c6..07db919be4 100644 --- a/libavcodec/dirac.c +++ b/libavcodec/dirac.c @@ -174,8 +174,7 @@ static int parse_source_parameters(AVCodecContext *avctx, GetBitContext *gb, /* [DIRAC_STD] Table 10.3 values 9-10 */ frame_rate = dirac_frame_rate[source->frame_rate_index - 9]; } - av_reduce(&avctx->time_base.num, &avctx->time_base.den, - frame_rate.den, frame_rate.num, 1 << 30); + avctx->framerate = frame_rate; /* [DIRAC_STD] 10.3.6 Pixel Aspect Ratio. * pixel_aspect_ratio(video_params) */ |