[FFmpeg-cvslog] yuv4mpeg: allow YUV4MPEG2 demuxer to recognize 'C420' colorspace.

Mike Melanson git at videolan.org
Tue Jan 31 03:36:05 CET 2012


ffmpeg | branch: master | Mike Melanson <mike at multimedia.cx> | Sun Jan 29 21:24:41 2012 -0800| [b864b38397a2962d265ad39005265bac4fb001ef] | committer: Anton Khirnov

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 <anton at khirnov.net>

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

 libavformat/yuv4mpeg.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/libavformat/yuv4mpeg.c b/libavformat/yuv4mpeg.c
index afb5bfa..df0fc8f 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)



More information about the ffmpeg-cvslog mailing list