From 8ed2ae09a25e5860342b97f7c2c7729fffaec320 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sat, 2 Apr 2011 11:56:21 +0200 Subject: 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. --- libavcodec/rv34.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'libavcodec/rv34.c') diff --git a/libavcodec/rv34.c b/libavcodec/rv34.c index 6eebf2aa4e..8122b66087 100644 --- a/libavcodec/rv34.c +++ b/libavcodec/rv34.c @@ -1454,15 +1454,19 @@ int ff_rv34_decode_frame(AVCodecContext *avctx, } if((!s->last_picture_ptr || !s->last_picture_ptr->data[0]) && si.type == FF_B_TYPE) return -1; +#if FF_API_HURRY_UP /* skip b frames if we are in a hurry */ if(avctx->hurry_up && si.type==FF_B_TYPE) return buf_size; +#endif if( (avctx->skip_frame >= AVDISCARD_NONREF && si.type==FF_B_TYPE) || (avctx->skip_frame >= AVDISCARD_NONKEY && si.type!=FF_I_TYPE) || avctx->skip_frame >= AVDISCARD_ALL) return buf_size; +#if FF_API_HURRY_UP /* skip everything if we are in a hurry>=5 */ if(avctx->hurry_up>=5) return buf_size; +#endif for(i=0; i