diff options
| author | Stefan Kost <ensonic@users.sourceforge.net> | 2007-06-20 08:26:21 +0000 |
|---|---|---|
| committer | Stefan Kost <ensonic@users.sourceforge.net> | 2007-06-20 08:26:21 +0000 |
| commit | 42ca9c44e6171d1c5e80f052c837efdf8c602311 (patch) | |
| tree | ef79dca9c42e146c644a5abe4167740dfb064d87 | |
| parent | b753979d860b22e27c57fda7b190295908147e50 (diff) | |
gst/qtdemux/: Add MJPG to the variants of motion jpeg.
Original commit message from CVS:
* gst/qtdemux/qtdemux.c: (qtdemux_parse_samples),
(qtdemux_video_caps):
* gst/qtdemux/qtdemux_fourcc.h:
Add MJPG to the variants of motion jpeg.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | gst/qtdemux/qtdemux.c | 5 | ||||
| -rw-r--r-- | gst/qtdemux/qtdemux_fourcc.h | 2 |
3 files changed, 11 insertions, 3 deletions
@@ -1,3 +1,10 @@ +2007-06-20 Stefan Kost <ensonic@users.sf.net> + + * gst/qtdemux/qtdemux.c: (qtdemux_parse_samples), + (qtdemux_video_caps): + * gst/qtdemux/qtdemux_fourcc.h: + Add MJPG to the variants of motion jpeg. + 2007-06-19 Tim-Philipp Müller <tim at centricular dot net> * tests/check/Makefile.am: diff --git a/gst/qtdemux/qtdemux.c b/gst/qtdemux/qtdemux.c index 1b1d9519..0b4b7aa8 100644 --- a/gst/qtdemux/qtdemux.c +++ b/gst/qtdemux/qtdemux.c @@ -2381,7 +2381,7 @@ qtdemux_parse_samples (GstQTDemux * qtdemux, QtDemuxStream * stream, n = QT_UINT32 ((guint8 *) stts->data + 16 + 8 * i); duration = QT_UINT32 ((guint8 *) stts->data + 16 + 8 * i + 4); for (j = 0; j < n; j++) { - GST_INFO_OBJECT (qtdemux, "sample %d: timestamp %" GST_TIME_FORMAT, + GST_DEBUG_OBJECT (qtdemux, "sample %d: timestamp %" GST_TIME_FORMAT, index, GST_TIME_ARGS (timestamp)); samples[index].timestamp = timestamp; @@ -2479,7 +2479,7 @@ qtdemux_parse_samples (GstQTDemux * qtdemux, QtDemuxStream * stream, samples[j].size = samples_per_chunk; } - GST_INFO_OBJECT (qtdemux, "sample %d: timestamp %" GST_TIME_FORMAT + GST_DEBUG_OBJECT (qtdemux, "sample %d: timestamp %" GST_TIME_FORMAT ", size %u", j, GST_TIME_ARGS (timestamp), samples[j].size); samples[j].timestamp = timestamp; @@ -3705,6 +3705,7 @@ qtdemux_video_caps (GstQTDemux * qtdemux, guint32 fourcc, return gst_caps_from_string ("image/jpeg"); case GST_MAKE_FOURCC ('m', 'j', 'p', 'a'): case GST_MAKE_FOURCC ('A', 'V', 'D', 'J'): + case GST_MAKE_FOURCC ('M', 'J', 'P', 'G'): _codec ("Motion-JPEG"); return gst_caps_from_string ("image/jpeg"); case GST_MAKE_FOURCC ('m', 'j', 'p', 'b'): diff --git a/gst/qtdemux/qtdemux_fourcc.h b/gst/qtdemux/qtdemux_fourcc.h index c196768a..16ad8511 100644 --- a/gst/qtdemux/qtdemux_fourcc.h +++ b/gst/qtdemux/qtdemux_fourcc.h @@ -126,7 +126,7 @@ G_BEGIN_DECLS #define FOURCC_alis GST_MAKE_FOURCC('a','l','i','s') #define FOURCC_url_ GST_MAKE_FOURCC('u','r','l',' ') #define FOURCC_frma GST_MAKE_FOURCC('f','r','m','a') -#define FOURCC_ctts GST_MAKE_FOURCC('c','t','t','s') +#define FOURCC_ctts GST_MAKE_FOURCC('c','t','t','s') G_END_DECLS |