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/eacmv.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/eacmv.c')
| -rw-r--r-- | libavcodec/eacmv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/eacmv.c b/libavcodec/eacmv.c index 4a1af8cf43..d1b7c68595 100644 --- a/libavcodec/eacmv.c +++ b/libavcodec/eacmv.c @@ -154,7 +154,7 @@ static int cmv_process_header(CmvContext *s, const uint8_t *buf, const uint8_t * fps = AV_RL16(&buf[10]); if (fps > 0) - s->avctx->time_base = (AVRational){ 1, fps }; + s->avctx->framerate = (AVRational){ fps, 1 }; pal_start = AV_RL16(&buf[12]); pal_count = AV_RL16(&buf[14]); |