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

diff --git a/ChangeLog b/ChangeLog
index 3ce7674b3a795485497610d8119fcd50c5b9167b..c68fcbe7fb0a1f5c20a7d6bc7b41b967ab251c83 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 bb83668c55a8893e9c25c72d81caae43dd13d79c..7e35c91df300c75323a10e1daf773f5a36cbb812 100644 (file)
--- 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"