From e8ff21fdf594b5b4fc851ca99935dddc2e534cb0 Mon Sep 17 00:00:00 2001 From: Vitor Sessak Date: Tue, 9 Mar 2010 08:20:11 +0000 Subject: [PATCH] Revert commit 22378. It broke FATE and kostya asked me on IRC to revert it. Originally committed as revision 22379 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/rv34.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libavcodec/rv34.c b/libavcodec/rv34.c index 1100fbd244..50ded79977 100644 --- a/libavcodec/rv34.c +++ b/libavcodec/rv34.c @@ -1452,12 +1452,8 @@ int ff_rv34_decode_frame(AVCodecContext *avctx, av_log(avctx, AV_LOG_ERROR, "First slice header is incorrect\n"); return -1; } - if((!s->last_picture_ptr || !s->last_picture_ptr->data[0]) && si.type == FF_P_TYPE) - return -1; if((!s->last_picture_ptr || !s->last_picture_ptr->data[0]) && si.type == FF_B_TYPE) return -1; - if((!s->next_picture_ptr || !s->next_picture_ptr->data[0]) && si.type == FF_B_TYPE) - return -1; /* skip b frames if we are in a hurry */ if(avctx->hurry_up && si.type==FF_B_TYPE) return buf_size; if( (avctx->skip_frame >= AVDISCARD_NONREF && si.type==FF_B_TYPE)