mirror of https://git.ffmpeg.org/ffmpeg.git
Remove error raising when explicitely skipping frame
patch by Carl Eugen Hoyos: [cehoyos ag or at] original thread: [FFmpeg-devel] [PATCH] Don't let ctx->skip_frame>0 produce errors date: 08/30/2007 01:30 PM Originally committed as revision 10286 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
9fcbcca60a
commit
1c746a490d
|
@ -7968,6 +7968,7 @@ static int decode_frame(AVCodecContext *avctx,
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
if(!(s->flags2 & CODEC_FLAG2_CHUNKS) && !s->current_picture_ptr){
|
if(!(s->flags2 & CODEC_FLAG2_CHUNKS) && !s->current_picture_ptr){
|
||||||
|
if (avctx->skip_frame >= AVDISCARD_NONREF || s->hurry_up) return 0;
|
||||||
av_log(avctx, AV_LOG_ERROR, "no frame!\n");
|
av_log(avctx, AV_LOG_ERROR, "no frame!\n");
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue