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/libschroedingerdec.c | |
| parent | 51c810e62b63a1451b337b1cba0141b386066668 (diff) | |
| parent | 7ea1b3472a61de4aa4d41b571e99418e4997ad41 (diff) | |
| download | ffmpeg-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/libschroedingerdec.c')
| -rw-r--r-- | libavcodec/libschroedingerdec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/libschroedingerdec.c b/libavcodec/libschroedingerdec.c index f20633a29e..dca3379203 100644 --- a/libavcodec/libschroedingerdec.c +++ b/libavcodec/libschroedingerdec.c @@ -195,8 +195,8 @@ static void libschroedinger_handle_first_access_unit(AVCodecContext *avctx) return; } - avctx->time_base.den = p_schro_params->format->frame_rate_numerator; - avctx->time_base.num = p_schro_params->format->frame_rate_denominator; + avctx->framerate.num = p_schro_params->format->frame_rate_numerator; + avctx->framerate.den = p_schro_params->format->frame_rate_denominator; } static int libschroedinger_decode_frame(AVCodecContext *avctx, |