From: <en...@ke...> - 2006-08-30 10:44:08
|
CVS Root: /cvs/gstreamer Module: gst-plugins-bad Changes by: ensonic Date: Wed Aug 30 2006 10:44:05 UTC Log message: * gst/qtdemux/qtdemux.c: (gst_qtdemux_activate_segment), (qtdemux_parse_tree): Fix the build for disabled debug Modified files: . : ChangeLog gst/qtdemux : qtdemux.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/ChangeLog.diff?r1=1.2224&r2=1.2225 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/gst/qtdemux/qtdemux.c.diff?r1=1.162&r2=1.163 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gst-plugins-bad/ChangeLog,v retrieving revision 1.2224 retrieving revision 1.2225 diff -u -d -r1.2224 -r1.2225 --- ChangeLog 29 Aug 2006 20:59:47 -0000 1.2224 +++ ChangeLog 30 Aug 2006 10:43:52 -0000 1.2225 @@ -1,3 +1,9 @@ +2006-08-30 Stefan Kost,,, <en...@us...> + + * gst/qtdemux/qtdemux.c: (gst_qtdemux_activate_segment), + (qtdemux_parse_tree): + Fix the build for disabled debug 2006-08-29 Edgard Lima <edg...@in...> * sys/v4l2/gstv4l2src.c: Index: qtdemux.c RCS file: /cvs/gstreamer/gst-plugins-bad/gst/qtdemux/qtdemux.c,v retrieving revision 1.162 retrieving revision 1.163 diff -u -d -r1.162 -r1.163 --- qtdemux.c 28 Aug 2006 17:47:29 -0000 1.162 +++ qtdemux.c 30 Aug 2006 10:43:53 -0000 1.163 @@ -1084,11 +1084,11 @@ 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 @@ 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" |