summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--gst/avi/gstavimux.c5
2 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index a527a63a..0fd520cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-02-28 David Schleef <ds@schleef.org>
+
+ * gst/avi/gstavimux.c: Add Dirac encoding
+
2008-02-28 Wim Taymans <wim.taymans@collabora.co.uk>
Patch by: Peter Kjellerstedt <pkj at axis com>
diff --git a/gst/avi/gstavimux.c b/gst/avi/gstavimux.c
index de692a21..d846fc1d 100644
--- a/gst/avi/gstavimux.c
+++ b/gst/avi/gstavimux.c
@@ -153,6 +153,9 @@ static GstStaticPadTemplate video_sink_factory =
"systemstream = (boolean) FALSE; "
"video/x-huffyuv, "
"width = (int) [ 16, 4096 ], "
+ "height = (int) [ 16, 4096 ], " "framerate = (fraction) [ 0, MAX ];"
+ "video/x-dirac, "
+ "width = (int) [ 16, 4096 ], "
"height = (int) [ 16, 4096 ], " "framerate = (fraction) [ 0, MAX ]")
);
@@ -552,6 +555,8 @@ gst_avi_mux_vidsink_set_caps (GstPad * pad, GstCaps * vscaps)
avipad->vids.compression = GST_MAKE_FOURCC ('M', 'P', 'E', 'G');
break;
}
+ } else if (!strcmp (mimetype, "video/x-dirac")) {
+ avipad->vids.compression = GST_MAKE_FOURCC ('d', 'r', 'a', 'c');
}
if (!avipad->vids.compression)