Skip to content

F
ffmpeg-mt
Commit 0c44313b authored by vitor's avatar vitor
Browse files
Options

Revert commit 22378. 

It broke FATE and kostya asked me on IRC to revert it.


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@22379 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 06b5a665
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 4 deletions
libavcodec/rv34.c
View file @ 0c44313b
...@@ -1452,12 +1452,8 @@ int ff_rv34_decode_frame(AVCodecContext *avctx, ...@@ -1452,12 +1452,8 @@ int ff_rv34_decode_frame(AVCodecContext *avctx,
av_log(avctx, AV_LOG_ERROR, "First slice header is incorrect\n"); av_log(avctx, AV_LOG_ERROR, "First slice header is incorrect\n");
return -1; 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) if((!s->last_picture_ptr || !s->last_picture_ptr->data[0]) && si.type == FF_B_TYPE)
return -1; 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 */ /* skip b frames if we are in a hurry */
if(avctx->hurry_up && si.type==FF_B_TYPE) return buf_size; if(avctx->hurry_up && si.type==FF_B_TYPE) return buf_size;
if( (avctx->skip_frame >= AVDISCARD_NONREF && si.type==FF_B_TYPE) if( (avctx->skip_frame >= AVDISCARD_NONREF && si.type==FF_B_TYPE)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment