summaryrefslogtreecommitdiff
path: root/libavcodec/h261dec.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2011-04-02 11:56:21 +0200
committerAnton Khirnov <anton@khirnov.net>2011-04-02 16:17:24 +0200
commit8ed2ae09a25e5860342b97f7c2c7729fffaec320 (patch)
treef76a64838f4f7c71ec4bc121d8ec238235c40a5a /libavcodec/h261dec.c
parent9073ca6c6ebb9e3e9b60d968b7aa16cc8b6d558d (diff)
downloadffmpeg-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/h261dec.c')
-rw-r--r--libavcodec/h261dec.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/h261dec.c b/libavcodec/h261dec.c
index 9b4d4c237d..93c5cb402d 100644
--- a/libavcodec/h261dec.c
+++ b/libavcodec/h261dec.c
@@ -595,12 +595,14 @@ retry:
goto retry;
}
- // 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;
+#if FF_API_HURRY_UP
/* skip everything if we are in a hurry>=5 */
if(avctx->hurry_up>=5) return get_consumed_bytes(s, 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)