From 1c746a490deb6939fce5cd207e1ad7bb54820f02 Mon Sep 17 00:00:00 2001
From: Carl Eugen Hoyos <cehoyos@ag.or.at>
Date: Mon, 3 Sep 2007 08:46:24 +0000
Subject: 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
---
 libavcodec/h264.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'libavcodec')

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;
     }
-- 
cgit v1.2.3