summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRonald S. Bultje <rbultje@ronald.bitfreak.net>2005-02-02 17:22:59 +0000
committerRonald S. Bultje <rbultje@ronald.bitfreak.net>2005-02-02 17:22:59 +0000
commita04dee4a8cbbc68f56b93bd0041c09fa4d0bae0d (patch)
tree995cc49db927fc4bf657e18ebdf046647ac64548
parente78ca2431235c220e1fa5292c5551829402fd585 (diff)
downloadgst-plugins-bad-a04dee4a8cbbc68f56b93bd0041c09fa4d0bae0d.tar.gz
gst-plugins-bad-a04dee4a8cbbc68f56b93bd0041c09fa4d0bae0d.tar.bz2
gst-plugins-bad-a04dee4a8cbbc68f56b93bd0041c09fa4d0bae0d.zip
gst/qtdemux/qtdemux.c: Change caps on MJPEG-B so it doesn't interfere with MJPEG/JPEG.
Original commit message from CVS: * gst/qtdemux/qtdemux.c: (qtdemux_video_caps): Change caps on MJPEG-B so it doesn't interfere with MJPEG/JPEG.
-rw-r--r--ChangeLog5
-rw-r--r--gst/qtdemux/qtdemux.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 64ecde73..06215e13 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2005-02-02 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
+ * gst/qtdemux/qtdemux.c: (qtdemux_video_caps):
+ Change caps on MJPEG-B so it doesn't interfere with MJPEG/JPEG.
+
+2005-02-02 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
+
* ext/raw1394/gstdv1394src.c: (gst_dv1394src_change_state):
Reset negotiated state on PAUSED->READY.
diff --git a/gst/qtdemux/qtdemux.c b/gst/qtdemux/qtdemux.c
index 4819a215..a65c9c68 100644
--- a/gst/qtdemux/qtdemux.c
+++ b/gst/qtdemux/qtdemux.c
@@ -2608,7 +2608,7 @@ qtdemux_video_caps (GstQTDemux * qtdemux, guint32 fourcc,
return gst_caps_from_string ("image/jpeg");
case GST_MAKE_FOURCC ('m', 'j', 'p', 'b'):
/* Motion-JPEG (format B) */
- return gst_caps_from_string ("image/jpeg");
+ return gst_caps_from_string ("image/jpeg-b");
case GST_MAKE_FOURCC ('S', 'V', 'Q', '3'):
if (stsd_data != NULL) {
gst_getbits_t gb;