diff options
| author | Steven Robertson <steven@strobe.cc> | 2012-07-22 09:59:25 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2012-07-22 09:59:25 +0200 |
| commit | 71311d697a1dfa210be4dce634ab6918b9dee74b (patch) | |
| tree | 4827a68799f5cd0ff162b8fc67a78b659a6ce9c6 /libavformat/yuv4mpeg.c | |
| parent | 2f48dff4550e8224c7aae03525df273aaebce171 (diff) | |
| download | ffmpeg-71311d697a1dfa210be4dce634ab6918b9dee74b.tar.gz | |
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.
Diffstat (limited to 'libavformat/yuv4mpeg.c')
| -rw-r--r-- | libavformat/yuv4mpeg.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/yuv4mpeg.c b/libavformat/yuv4mpeg.c index 90a1b06034..21967505d9 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"); |