diff options
| author | Wim Taymans <wim.taymans@gmail.com> | 2006-05-08 15:20:10 +0000 |
|---|---|---|
| committer | Wim Taymans <wim.taymans@gmail.com> | 2006-05-08 15:20:10 +0000 |
| commit | 9b5f1ef1d39f460f8c38f7744437e5499bec9452 (patch) | |
| tree | ce229b7d7cc55afa8feb5ed36ce2f4cb29fe7761 | |
| parent | 8ed961fdec865671f263e8ea881955c9bb15bd11 (diff) | |
| download | gst-plugins-bad-9b5f1ef1d39f460f8c38f7744437e5499bec9452.tar.gz gst-plugins-bad-9b5f1ef1d39f460f8c38f7744437e5499bec9452.tar.bz2 gst-plugins-bad-9b5f1ef1d39f460f8c38f7744437e5499bec9452.zip | |
gst/qtdemux/qtdemux.c: Don't cause side effects in a debugging function.
Original commit message from CVS:
* gst/qtdemux/qtdemux.c: (gst_qtdemux_handle_src_query),
(qtdemux_dump_mvhd):
Don't cause side effects in a debugging function.
Also report duration in push mode since we can.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | gst/qtdemux/qtdemux.c | 11 |
2 files changed, 12 insertions, 6 deletions
@@ -1,3 +1,10 @@ +2006-05-08 Wim Taymans <wim@fluendo.com> + + * gst/qtdemux/qtdemux.c: (gst_qtdemux_handle_src_query), + (qtdemux_dump_mvhd): + Don't cause side effects in a debugging function. + Also report duration in push mode since we can. + 2006-05-08 Edward Hervey <edward@fluendo.com> * autogen.sh: (CONFIGURE_DEF_OPT): diff --git a/gst/qtdemux/qtdemux.c b/gst/qtdemux/qtdemux.c index 81cde549..bcca1481 100644 --- a/gst/qtdemux/qtdemux.c +++ b/gst/qtdemux/qtdemux.c @@ -478,8 +478,7 @@ gst_qtdemux_handle_src_query (GstPad * pad, GstQuery * query) } break; case GST_QUERY_DURATION: - if (qtdemux->pullbased && qtdemux->duration != 0 - && qtdemux->timescale != 0) { + if (qtdemux->duration != 0 && qtdemux->timescale != 0) { gint64 duration; duration = gst_util_uint64_scale_int (qtdemux->duration, @@ -2444,10 +2443,10 @@ qtdemux_dump_mvhd (GstQTDemux * qtdemux, void *buffer, int depth) QTDEMUX_GUINT32_GET (buffer + 12)); GST_LOG ("%*s modify time: %u", depth, "", QTDEMUX_GUINT32_GET (buffer + 16)); - qtdemux->duration = QTDEMUX_GUINT32_GET (buffer + 24); - qtdemux->timescale = QTDEMUX_GUINT32_GET (buffer + 20); - GST_LOG ("%*s time scale: 1/%u sec", depth, "", qtdemux->timescale); - GST_LOG ("%*s duration: %u", depth, "", qtdemux->duration); + GST_LOG ("%*s time scale: 1/%u sec", depth, "", + QTDEMUX_GUINT32_GET (buffer + 20)); + GST_LOG ("%*s duration: %u", depth, "", + QTDEMUX_GUINT32_GET (buffer + 24)); GST_LOG ("%*s pref. rate: %g", depth, "", QTDEMUX_FP32_GET (buffer + 28)); GST_LOG ("%*s pref. volume: %g", depth, "", QTDEMUX_FP16_GET (buffer + 32)); GST_LOG ("%*s preview time: %u", depth, "", |