summaryrefslogtreecommitdiff
path: root/libavcodec/vc1dec.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/vc1dec.c
parent73a4f7c21bbb179f7542d8a5fedf55fd894fa9da (diff)
lavc: remove FF_API_HURRY_UP cruft
Diffstat (limited to 'libavcodec/vc1dec.c')
-rw-r--r--libavcodec/vc1dec.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c
index 6e73317451..28f77c0d80 100644
--- a/libavcodec/vc1dec.c
+++ b/libavcodec/vc1dec.c
@@ -3510,21 +3510,11 @@ 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)