diff options
| author | Vitor Sessak <vitor1001@gmail.com> | 2010-03-09 08:20:11 +0000 |
|---|---|---|
| committer | Vitor Sessak <vitor1001@gmail.com> | 2010-03-09 08:20:11 +0000 |
| commit | e8ff21fdf594b5b4fc851ca99935dddc2e534cb0 (patch) | |
| tree | 27277cccd063a6e681037fe44de0799f5f365c39 /libavcodec/rv34.c | |
| parent | 07cea6d1cd4e2db922c3e331e86801db3871e08d (diff) | |
| download | ffmpeg-e8ff21fdf594b5b4fc851ca99935dddc2e534cb0.tar.gz | |
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
Diffstat (limited to 'libavcodec/rv34.c')
| -rw-r--r-- | libavcodec/rv34.c | 4 |
1 files changed, 0 insertions, 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) |