mirror of
https://gitee.com/openharmony/third_party_ffmpeg
synced 2024-11-24 03:39:45 +00:00
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
This commit is contained in:
parent
07cea6d1cd
commit
e8ff21fdf5
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user