summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Schleef <ds@schleef.org>2009-01-09 21:59:48 +0000
committerDavid Schleef <ds@schleef.org>2009-01-09 21:59:48 +0000
commit413016e459ae4e3c4c1411b51d23c9ebf98e52d9 (patch)
treeb0aa1644df80fa8b79bc43729a938745e666bbf0
parentd119d3125944d2c0dd39ce5b85dc3f2123de7f26 (diff)
gst/qtmux/gstqtmuxmap.c: Add video/x-qt-part and video/x-m4-part to caps so schroenc/schroparse can use it. Fixes #5...
Original commit message from CVS: * gst/qtmux/gstqtmuxmap.c: Add video/x-qt-part and video/x-m4-part to caps so schroenc/schroparse can use it. Fixes #566958
-rw-r--r--ChangeLog5
-rw-r--r--gst/qtmux/gstqtmuxmap.c6
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 9f07eb56c..cf7795d22 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-01-09 David Schleef <ds@schleef.org>
+
+ * gst/qtmux/gstqtmuxmap.c: Add video/x-qt-part and video/x-m4-part
+ to caps so schroenc/schroparse can use it. Fixes #566958
+
2009-01-09 Jan Schmidt <jan.schmidt@sun.com>
* ext/resindvd/resindvdsrc.c:
diff --git a/gst/qtmux/gstqtmuxmap.c b/gst/qtmux/gstqtmuxmap.c
index 0f876b305..af1cb31df 100644
--- a/gst/qtmux/gstqtmuxmap.c
+++ b/gst/qtmux/gstqtmuxmap.c
@@ -135,7 +135,8 @@ GstQTMuxFormatProp gst_qt_mux_format_list[] = {
"systemstream = (boolean) false, "
COMMON_VIDEO_CAPS "; "
"image/jpeg, "
- COMMON_VIDEO_CAPS_NO_FRAMERATE "; " "video/x-qt-part"),
+ COMMON_VIDEO_CAPS_NO_FRAMERATE "; "
+ "video/x-qt-part, " COMMON_VIDEO_CAPS),
GST_STATIC_CAPS (PCM_CAPS_FULL "; "
MP3_CAPS " ; "
AAC_CAPS " ; "
@@ -153,7 +154,8 @@ GstQTMuxFormatProp gst_qt_mux_format_list[] = {
"GstMP4Mux",
/* FIXME does not feel right, due to qt caps mess */
GST_STATIC_CAPS ("video/quicktime"),
- GST_STATIC_CAPS (MPEG4V_CAPS "; " H264_CAPS),
+ GST_STATIC_CAPS (MPEG4V_CAPS "; " H264_CAPS ";"
+ "video/x-mp4-part," COMMON_VIDEO_CAPS),
GST_STATIC_CAPS (MP3_CAPS "; " AAC_CAPS)
}
,