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/vc1dec.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/vc1dec.c')
| -rw-r--r-- | libavcodec/vc1dec.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index 55f12a6aa6..cde284dac2 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -3374,7 +3374,7 @@ static int vc1_decode_frame(AVCodecContext *avctx, goto err; } - // for hurry_up==5 + // for skipping the frame s->current_picture.pict_type= s->pict_type; s->current_picture.key_frame= s->pict_type == FF_I_TYPE; @@ -3382,17 +3382,21 @@ static int vc1_decode_frame(AVCodecContext *avctx, if(s->last_picture_ptr==NULL && (s->pict_type==FF_B_TYPE || s->dropable)){ goto err; } +#if FF_API_HURRY_UP /* skip b frames if we are in a hurry */ if(avctx->hurry_up && s->pict_type==FF_B_TYPE) return -1;//buf_size; +#endif if( (avctx->skip_frame >= AVDISCARD_NONREF && s->pict_type==FF_B_TYPE) || (avctx->skip_frame >= AVDISCARD_NONKEY && s->pict_type!=FF_I_TYPE) || avctx->skip_frame >= AVDISCARD_ALL) { goto end; } +#if FF_API_HURRY_UP /* skip everything if we are in a hurry>=5 */ if(avctx->hurry_up>=5) { goto err; } +#endif if(s->next_p_frame_damaged){ if(s->pict_type==FF_B_TYPE) |