diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2007-09-03 08:46:24 +0000 |
|---|---|---|
| committer | Benoit Fouet <benoit.fouet@free.fr> | 2007-09-03 08:46:24 +0000 |
| commit | 1c746a490deb6939fce5cd207e1ad7bb54820f02 (patch) | |
| tree | 00926afc1db91a7815d466bbf9f2986f2b583793 /libavcodec/h264.c | |
| parent | 9fcbcca60a6d838924d662df95b194525254f0ac (diff) | |
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
Diffstat (limited to 'libavcodec/h264.c')
| -rw-r--r-- | libavcodec/h264.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 5ea99e1924..1649f712fa 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -7968,6 +7968,7 @@ static int decode_frame(AVCodecContext *avctx, return -1; 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"); return -1; } |