From 4207d2fe745c60acbff1ab54205ac280db70601a Mon Sep 17 00:00:00 2001 From: David Schleef Date: Wed, 15 Nov 2006 00:12:19 +0000 Subject: [PATCH] gst/matroska/matroska-mux.c: Add Dirac fourcc. Original commit message from CVS: * gst/matroska/matroska-mux.c: Add Dirac fourcc. --- ChangeLog | 4 ++++ gst/matroska/matroska-mux.c | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 5539b595db..2f5b7ecead 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2006-11-14 David Schleef + + * gst/matroska/matroska-mux.c: Add Dirac fourcc. + 2006-11-14 Tim-Philipp Müller Patch by: Sergey Scobich diff --git a/gst/matroska/matroska-mux.c b/gst/matroska/matroska-mux.c index 473e2ba369..8b62c301c0 100644 --- a/gst/matroska/matroska-mux.c +++ b/gst/matroska/matroska-mux.c @@ -76,6 +76,8 @@ static GstStaticPadTemplate videosink_templ = "image/jpeg, " COMMON_VIDEO_CAPS "; " "video/x-theora; " + "video/x-dirac, " + COMMON_VIDEO_CAPS "; " "video/x-raw-yuv, " "format = (fourcc) { YUY2, I420 }, " COMMON_VIDEO_CAPS) ); @@ -497,7 +499,8 @@ skip_details: ||!strcmp (mimetype, "video/x-huffyuv") || !strcmp (mimetype, "video/x-divx") || !strcmp (mimetype, "video/x-dv") - || !strcmp (mimetype, "video/x-h263")) { + || !strcmp (mimetype, "video/x-h263") + || !strcmp (mimetype, "video/x-dirac")) { BITMAPINFOHEADER *bih; const GValue *codec_data; gint size = sizeof (BITMAPINFOHEADER); @@ -534,6 +537,8 @@ skip_details: GST_WRITE_UINT32_LE (&bih->bi_compression, GST_STR_FOURCC ("DX50")); break; } + } else if (!strcmp (mimetype, "video/x-dirac")) { + GST_WRITE_UINT32_LE (&bih->bi_compression, GST_STR_FOURCC ("drac")); } /* process codec private/initialization data, if any */