[gst-cvs] gst-plugins-good: qtdemux: Avoid whitespace commits due to inconsistent GNU indent
Robert Swain
robswain at kemper.freedesktop.org
Mon Jan 11 00:51:07 PST 2010
Module: gst-plugins-good
Branch: master
Commit: 3daf1871c11134dffc303afb7d12d9df55cb5c80
URL: http://cgit.freedesktop.org/gstreamer/gst-plugins-good/commit/?id=3daf1871c11134dffc303afb7d12d9df55cb5c80
Author: Robert Swain <robert.swain at collabora.co.uk>
Date: Fri Jan 8 14:32:06 2010 +0100
qtdemux: Avoid whitespace commits due to inconsistent GNU indent
behaviour
---
gst/qtdemux/qtdemux.c | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/gst/qtdemux/qtdemux.c b/gst/qtdemux/qtdemux.c
index afb9953..7a05324 100644
--- a/gst/qtdemux/qtdemux.c
+++ b/gst/qtdemux/qtdemux.c
@@ -2109,6 +2109,9 @@ gst_qtdemux_activate_segment (GstQTDemux * qtdemux, QtDemuxStream * stream,
/* find keyframe of the target index */
kf_index = gst_qtdemux_find_keyframe (qtdemux, stream, index);
+/* *INDENT-OFF* */
+/* indent does stupid stuff with stream->samples[].timestamp */
+
/* if we move forwards, we don't have to go back to the previous
* keyframe since we already sent that. We can also just jump to
* the keyframe right before the target index if there is one. */
@@ -2117,24 +2120,29 @@ gst_qtdemux_activate_segment (GstQTDemux * qtdemux, QtDemuxStream * stream,
if (kf_index > stream->sample_index) {
GST_DEBUG_OBJECT (qtdemux,
"moving forwards to keyframe at %u (pts %" GST_TIME_FORMAT, kf_index,
- GST_TIME_ARGS (gst_util_uint64_scale (stream->samples[kf_index].
- timestamp, GST_SECOND, stream->timescale)));
+ GST_TIME_ARGS (gst_util_uint64_scale (
+ stream->samples[kf_index].timestamp,
+ GST_SECOND, stream->timescale)));
gst_qtdemux_move_stream (qtdemux, stream, kf_index);
} else {
GST_DEBUG_OBJECT (qtdemux,
"moving forwards, keyframe at %u (pts %" GST_TIME_FORMAT
" already sent", kf_index,
- GST_TIME_ARGS (gst_util_uint64_scale (stream->samples[kf_index].
- timestamp, GST_SECOND, stream->timescale)));
+ GST_TIME_ARGS (gst_util_uint64_scale (
+ stream->samples[kf_index].timestamp,
+ GST_SECOND, stream->timescale)));
}
} else {
GST_DEBUG_OBJECT (qtdemux,
"moving backwards to keyframe at %u (pts %" GST_TIME_FORMAT, kf_index,
- GST_TIME_ARGS (gst_util_uint64_scale (stream->samples[kf_index].
- timestamp, GST_SECOND, stream->timescale)));
+ GST_TIME_ARGS (gst_util_uint64_scale (
+ stream->samples[kf_index].timestamp,
+ GST_SECOND, stream->timescale)));
gst_qtdemux_move_stream (qtdemux, stream, kf_index);
}
+/* *INDENT-ON* */
+
return TRUE;
}
More information about the Gstreamer-commits
mailing list