summaryrefslogtreecommitdiff
path: root/libavcodec/mpeg12.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2011-04-12 20:51:40 +0200
committerAnton Khirnov <anton@khirnov.net>2011-04-26 08:16:05 +0200
commite7021c0ed5d1265d5b4f0f01a01f840196a70415 (patch)
treedcb6a114d1a187001a03af53436d7b50aca79cb3 /libavcodec/mpeg12.c
parent73a4f7c21bbb179f7542d8a5fedf55fd894fa9da (diff)
downloadffmpeg-e7021c0ed5d1265d5b4f0f01a01f840196a70415.tar.gz
lavc: remove FF_API_HURRY_UP cruft
Diffstat (limited to 'libavcodec/mpeg12.c')
-rw-r--r--libavcodec/mpeg12.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c
index 0676f18157..02d3e6602a 100644
--- a/libavcodec/mpeg12.c
+++ b/libavcodec/mpeg12.c
@@ -2398,18 +2398,10 @@ 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;