[FFmpeg-cvslog] Do not fail for mixed interlaced / non-interlaced YUV4MPEG streams.

Carl Eugen Hoyos git at videolan.org
Sat Feb 2 00:03:37 CET 2013


ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Fri Feb  1 23:55:54 2013 +0100| [985e93a86518f05cbed873b891011290096b013b] | committer: Carl Eugen Hoyos

Do not fail for mixed interlaced / non-interlaced YUV4MPEG streams.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=985e93a86518f05cbed873b891011290096b013b
---

 libavformat/yuv4mpeg.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/yuv4mpeg.c b/libavformat/yuv4mpeg.c
index ff039bd..e2ab8e3 100644
--- a/libavformat/yuv4mpeg.c
+++ b/libavformat/yuv4mpeg.c
@@ -442,7 +442,7 @@ static int yuv4_read_header(AVFormatContext *s)
             case 'm':
                 av_log(s, AV_LOG_ERROR, "YUV4MPEG stream contains mixed "
                        "interlaced and non-interlaced frames.\n");
-                return -1;
+                break;
             default:
                 av_log(s, AV_LOG_ERROR, "YUV4MPEG has invalid header.\n");
                 return -1;



More information about the ffmpeg-cvslog mailing list