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/mpeg12.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/mpeg12.c')
| -rw-r--r-- | libavcodec/mpeg12.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c index c47b6e2877..06aa8aba58 100644 --- a/libavcodec/mpeg12.c +++ b/libavcodec/mpeg12.c @@ -2398,14 +2398,18 @@ static int decode_chunks(AVCodecContext *avctx, /* Skip P-frames if we do not have a reference frame or we have an invalid header. */ if(s2->pict_type==FF_P_TYPE && !s->sync) break; } +#if FF_API_HURRY_UP /* Skip B-frames if we are in a hurry. */ if(avctx->hurry_up && s2->pict_type==FF_B_TYPE) break; +#endif if( (avctx->skip_frame >= AVDISCARD_NONREF && s2->pict_type==FF_B_TYPE) ||(avctx->skip_frame >= AVDISCARD_NONKEY && s2->pict_type!=FF_I_TYPE) || avctx->skip_frame >= AVDISCARD_ALL) break; +#if FF_API_HURRY_UP /* Skip everything if we are in a hurry>=5. */ if(avctx->hurry_up>=5) break; +#endif if (!s->mpeg_enc_ctx_allocated) break; |