Commit 71311d69 authored by Steven Robertson's avatar Steven Robertson Committed by 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.
parent 2f48dff4
...@@ -366,10 +366,10 @@ static int yuv4_read_header(AVFormatContext *s) ...@@ -366,10 +366,10 @@ static int yuv4_read_header(AVFormatContext *s)
return -1; return -1;
} else if (strncmp("444", tokstart, 3) == 0) { } else if (strncmp("444", tokstart, 3) == 0) {
pix_fmt = PIX_FMT_YUV444P; pix_fmt = PIX_FMT_YUV444P;
} else if (strncmp("mono", tokstart, 4) == 0) {
pix_fmt = PIX_FMT_GRAY8;
} else if (strncmp("mono16", tokstart, 6) == 0) { } else if (strncmp("mono16", tokstart, 6) == 0) {
pix_fmt = PIX_FMT_GRAY16; pix_fmt = PIX_FMT_GRAY16;
} else if (strncmp("mono", tokstart, 4) == 0) {
pix_fmt = PIX_FMT_GRAY8;
} else { } else {
av_log(s, AV_LOG_ERROR, "YUV4MPEG stream contains an unknown " av_log(s, AV_LOG_ERROR, "YUV4MPEG stream contains an unknown "
"pixel format.\n"); "pixel format.\n");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment