mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-08-01 19:25:10 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst/qtdemux/qtdemux.c: Fix the build for disabled debug

Browse source 
Original commit message from CVS:
* gst/qtdemux/qtdemux.c: (gst_qtdemux_activate_segment),
(qtdemux_parse_tree):
Fix the build for disabled debug
This commit is contained in:
Stefan Kost 2006-08-30 10:43:53 +00:00
parent b368225bc6
commit 669deaab52
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -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:

5
gst/qtdemux/qtdemux.c
View file

@ -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"