videolan
/
ffmpeg
mirror of https://git.videolan.org/git/ffmpeg.git
1
Fork 0
Code Releases Activity

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.
This commit is contained in:
Steven Robertson 2012-07-22 09:59:25 +02:00 committed by Carl Eugen Hoyos
parent 2f48dff455
commit 71311d697a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/yuv4mpeg.c
View File

@ -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");