diff options
| author | Stefan Kost <ensonic@users.sourceforge.net> | 2006-08-30 10:43:53 +0000 |
|---|---|---|
| committer | Stefan Kost <ensonic@users.sourceforge.net> | 2006-08-30 10:43:53 +0000 |
| commit | 669deaab5220fb50035e3ed735b96319ff76ea45 (patch) | |
| tree | 23ebc771f22db7d0ad5091562980bcb3be223033 | |
| parent | b368225bc6030ae8edbbf6dfbb0e2f5477af497b (diff) | |
| download | gst-plugins-bad-669deaab5220fb50035e3ed735b96319ff76ea45.tar.gz gst-plugins-bad-669deaab5220fb50035e3ed735b96319ff76ea45.tar.bz2 gst-plugins-bad-669deaab5220fb50035e3ed735b96319ff76ea45.zip | |
gst/qtdemux/qtdemux.c: Fix the build for disabled debug
Original commit message from CVS:
* gst/qtdemux/qtdemux.c: (gst_qtdemux_activate_segment),
(qtdemux_parse_tree):
Fix the build for disabled debug
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | gst/qtdemux/qtdemux.c | 5 |
2 files changed, 10 insertions, 1 deletions
@@ -1,3 +1,9 @@ +2006-08-30 Stefan Kost,,, <ensonic@users.sf.net> + + * gst/qtdemux/qtdemux.c: (gst_qtdemux_activate_segment), + (qtdemux_parse_tree): + Fix the build for disabled debug + 2006-08-29 Edgard Lima <edgard.lima@indt.org.br> * sys/v4l2/gstv4l2src.c: diff --git a/gst/qtdemux/qtdemux.c b/gst/qtdemux/qtdemux.c index bb83668c..7e35c91d 100644 --- a/gst/qtdemux/qtdemux.c +++ b/gst/qtdemux/qtdemux.c @@ -1084,11 +1084,11 @@ gst_qtdemux_activate_segment (GstQTDemux * qtdemux, QtDemuxStream * stream, return FALSE; /* calc media start/stop */ + start = segment->media_start + seg_time; if (qtdemux->segment.stop == -1) stop = segment->media_stop; else stop = MIN (segment->media_stop, qtdemux->segment.stop); - start = MIN (segment->media_start + seg_time, stop); GST_DEBUG_OBJECT (qtdemux, "newsegment %d from %" GST_TIME_FORMAT " to %" GST_TIME_FORMAT ", time %" GST_TIME_FORMAT, seg_idx, @@ -3040,7 +3040,10 @@ qtdemux_parse_tree (GstQTDemux * qtdemux) if ((rmvc = qtdemux_tree_get_child_by_type (rmda, FOURCC_rmvc))) { guint32 package = QTDEMUX_FOURCC_GET ((guint8 *) rmvc->data + 12); guint version = QTDEMUX_GUINT32_GET ((guint8 *) rmvc->data + 16); + +#ifndef GST_DISABLE_GST_DEBUG guint bitmask = QTDEMUX_GUINT32_GET ((guint8 *) rmvc->data + 20); +#endif guint check_type = QTDEMUX_GUINT16_GET ((guint8 *) rmvc->data + 24); GST_LOG ("version check atom [%" GST_FOURCC_FORMAT "], version=0x%08x" |