Commit 1c746a49 authored by Carl Eugen Hoyos's avatar Carl Eugen Hoyos Committed by Benoit Fouet

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
parent 9fcbcca6
...@@ -7968,6 +7968,7 @@ static int decode_frame(AVCodecContext *avctx, ...@@ -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;
} }
......
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