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/svq3.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'libavcodec/svq3.c') diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c index a385373f9c..5886713b28 100644 --- a/libavcodec/svq3.c +++ b/libavcodec/svq3.c @@ -945,19 +945,21 @@ static int svq3_decode_frame(AVCodecContext *avctx, s->adaptive_quant, s->qscale, h->slice_num); } - /* 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); /* Skip B-frames if we do not have reference frames. */ if (s->last_picture_ptr == NULL && s->pict_type == FF_B_TYPE) return 0; +#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 0; /* Skip everything if we are in a hurry >= 5. */ if (avctx->hurry_up >= 5) return 0; +#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) -- cgit v1.2.3