diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-04-02 11:56:21 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2011-04-02 16:17:24 +0200 |
| commit | 8ed2ae09a25e5860342b97f7c2c7729fffaec320 (patch) | |
| tree | f76a64838f4f7c71ec4bc121d8ec238235c40a5a /libavcodec/mpegvideo.c | |
| parent | 9073ca6c6ebb9e3e9b60d968b7aa16cc8b6d558d (diff) | |
| download | ffmpeg-8ed2ae09a25e5860342b97f7c2c7729fffaec320.tar.gz | |
lavc: mark hurry_up for removal on next major bump
It has been deprecated for about five years, skip_idct/skip_frame should
be used instead.
Diffstat (limited to 'libavcodec/mpegvideo.c')
| -rw-r--r-- | libavcodec/mpegvideo.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 1c5ff27e5f..b6cc459631 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -1025,7 +1025,9 @@ int MPV_frame_start(MpegEncContext *s, AVCodecContext *avctx) } } +#if FF_API_HURRY_UP s->hurry_up= s->avctx->hurry_up; +#endif s->error_recognition= avctx->error_recognition; /* set dequantizer, we can't do it during init as it might change for mpeg4 @@ -1962,7 +1964,9 @@ void MPV_decode_mb_internal(MpegEncContext *s, DCTELEM block[12][64], } /* skip dequant / idct if we are really late ;) */ +#if FF_API_HURRY_UP if(s->hurry_up>1) goto skip_idct; +#endif if(s->avctx->skip_idct){ if( (s->avctx->skip_idct >= AVDISCARD_NONREF && s->pict_type == FF_B_TYPE) ||(s->avctx->skip_idct >= AVDISCARD_NONKEY && s->pict_type != FF_I_TYPE) |