From b864b38397a2962d265ad39005265bac4fb001ef Mon Sep 17 00:00:00 2001 From: Mike Melanson Date: Sun, 29 Jan 2012 21:24:41 -0800 Subject: yuv4mpeg: allow YUV4MPEG2 demuxer to recognize 'C420' colorspace. Current demuxer recognizes several colorspace formats that begin with 'C420' but does not yet recognize plain 'C420'. GStreamer's y4menc component generates .y4m files with a 'C420' colorspace. This new comparison is placed after the other 'C420' checks so that it doesn't interfere with them. Signed-off-by: Anton Khirnov --- libavformat/yuv4mpeg.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'libavformat/yuv4mpeg.c') diff --git a/libavformat/yuv4mpeg.c b/libavformat/yuv4mpeg.c index afb5bfaab2..df0fc8f1a5 100644 --- a/libavformat/yuv4mpeg.c +++ b/libavformat/yuv4mpeg.c @@ -244,6 +244,9 @@ static int yuv4_read_header(AVFormatContext *s) } else if (strncmp("420paldv", tokstart, 8) == 0) { pix_fmt = PIX_FMT_YUV420P; chroma_sample_location = AVCHROMA_LOC_TOPLEFT; + } else if (strncmp("420", tokstart, 3) == 0) { + pix_fmt = PIX_FMT_YUV420P; + chroma_sample_location = AVCHROMA_LOC_CENTER; } else if (strncmp("411", tokstart, 3) == 0) pix_fmt = PIX_FMT_YUV411P; else if (strncmp("422", tokstart, 3) == 0) -- cgit v1.2.3