[FFmpeg-cvslog] Fix yuv4mpeg parsing of 'mono16' files.

Steven Robertson git at videolan.org
Sun Jul 22 10:00:33 CEST 2012


ffmpeg | branch: master | Steven Robertson <steven at strobe.cc> | Sun Jul 22 09:59:25 2012 +0200| [71311d697a1dfa210be4dce634ab6918b9dee74b] | committer: Carl Eugen Hoyos

Fix yuv4mpeg parsing of 'mono16' files.

'mono' came before 'mono16' in the list of colorspace alternatives,
causing files of the latter type to be parsed as the former.

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

 libavformat/yuv4mpeg.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavformat/yuv4mpeg.c b/libavformat/yuv4mpeg.c
index 90a1b06..2196750 100644
--- a/libavformat/yuv4mpeg.c
+++ b/libavformat/yuv4mpeg.c
@@ -366,10 +366,10 @@ static int yuv4_read_header(AVFormatContext *s)
                 return -1;
             } else if (strncmp("444", tokstart, 3) == 0) {
                 pix_fmt = PIX_FMT_YUV444P;
-            } else if (strncmp("mono", tokstart, 4) == 0) {
-                pix_fmt = PIX_FMT_GRAY8;
             } else if (strncmp("mono16", tokstart, 6) == 0) {
                 pix_fmt = PIX_FMT_GRAY16;
+            } else if (strncmp("mono", tokstart, 4) == 0) {
+                pix_fmt = PIX_FMT_GRAY8;
             } else {
                 av_log(s, AV_LOG_ERROR, "YUV4MPEG stream contains an unknown "
                        "pixel format.\n");



More information about the ffmpeg-cvslog mailing list