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/dvdec.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/dvdec.c')
| -rw-r--r-- | libavcodec/dvdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/dvdec.c b/libavcodec/dvdec.c index 5751135409..3af14b823c 100644 --- a/libavcodec/dvdec.c +++ b/libavcodec/dvdec.c @@ -382,7 +382,7 @@ static int dvvideo_decode_frame(AVCodecContext *avctx, void *data, s->frame->key_frame = 1; s->frame->pict_type = AV_PICTURE_TYPE_I; avctx->pix_fmt = s->sys->pix_fmt; - avctx->time_base = s->sys->time_base; + avctx->framerate = av_inv_q(s->sys->time_base); ret = ff_set_dimensions(avctx, s->sys->width, s->sys->height); if (ret < 0) |