mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-09-08 13:18:52 +00:00
gst/: Printf format fixes (#476128).
Original commit message from CVS: Patch by: Peter Kjellerstedt <pkj at axis com> * gst-libs/gst/app/gstappsink.c: * gst/flv/gstflvdemux.c: * gst/flv/gstflvparse.c: * gst/interleave/deinterleave.c: * gst/switch/gstswitch.c: Printf format fixes (#476128).
This commit is contained in:
parent
ee01676c0d
commit
a698a439be
6 changed files with 24 additions and 10 deletions
11
ChangeLog
11
ChangeLog
|
@ -1,3 +1,14 @@
|
||||||
|
2007-09-12 Tim-Philipp Müller <tim at centricular dot net>
|
||||||
|
|
||||||
|
Patch by: Peter Kjellerstedt <pkj at axis com>
|
||||||
|
|
||||||
|
* gst-libs/gst/app/gstappsink.c:
|
||||||
|
* gst/flv/gstflvdemux.c:
|
||||||
|
* gst/flv/gstflvparse.c:
|
||||||
|
* gst/interleave/deinterleave.c:
|
||||||
|
* gst/switch/gstswitch.c:
|
||||||
|
Printf format fixes (#476128).
|
||||||
|
|
||||||
2007-09-09 Tim-Philipp Müller <tim at centricular dot net>
|
2007-09-09 Tim-Philipp Müller <tim at centricular dot net>
|
||||||
|
|
||||||
Patch by: Thomas Green <tom78999 gmail com>
|
Patch by: Thomas Green <tom78999 gmail com>
|
||||||
|
|
|
@ -270,7 +270,7 @@ gst_app_sink_get_caps (GstBaseSink * psink)
|
||||||
GST_OBJECT_LOCK (appsink);
|
GST_OBJECT_LOCK (appsink);
|
||||||
if ((caps = appsink->caps))
|
if ((caps = appsink->caps))
|
||||||
gst_caps_ref (caps);
|
gst_caps_ref (caps);
|
||||||
GST_DEBUG_OBJECT (appsink, "got caps " GST_PTR_FORMAT, caps);
|
GST_DEBUG_OBJECT (appsink, "got caps %" GST_PTR_FORMAT, caps);
|
||||||
GST_OBJECT_UNLOCK (appsink);
|
GST_OBJECT_UNLOCK (appsink);
|
||||||
|
|
||||||
return caps;
|
return caps;
|
||||||
|
@ -295,7 +295,7 @@ gst_app_sink_set_caps (GstAppSink * appsink, GstCaps * caps)
|
||||||
g_return_if_fail (GST_IS_APP_SINK (appsink));
|
g_return_if_fail (GST_IS_APP_SINK (appsink));
|
||||||
|
|
||||||
GST_OBJECT_LOCK (appsink);
|
GST_OBJECT_LOCK (appsink);
|
||||||
GST_DEBUG_OBJECT (appsink, "setting caps to " GST_PTR_FORMAT, caps);
|
GST_DEBUG_OBJECT (appsink, "setting caps to %" GST_PTR_FORMAT, caps);
|
||||||
gst_caps_replace (&appsink->caps, caps);
|
gst_caps_replace (&appsink->caps, caps);
|
||||||
GST_OBJECT_UNLOCK (appsink);
|
GST_OBJECT_UNLOCK (appsink);
|
||||||
}
|
}
|
||||||
|
|
|
@ -321,12 +321,14 @@ gst_flv_demux_pull_tag (GstPad * pad, GstFLVDemux * demux)
|
||||||
/* Pull the whole tag */
|
/* Pull the whole tag */
|
||||||
ret = gst_pad_pull_range (pad, demux->offset, demux->tag_size, &buffer);
|
ret = gst_pad_pull_range (pad, demux->offset, demux->tag_size, &buffer);
|
||||||
if (G_UNLIKELY (ret != GST_FLOW_OK)) {
|
if (G_UNLIKELY (ret != GST_FLOW_OK)) {
|
||||||
GST_WARNING_OBJECT (demux, "failed when pulling %d bytes", demux->tag_size);
|
GST_WARNING_OBJECT (demux,
|
||||||
|
"failed when pulling %" G_GUINT64_FORMAT " bytes", demux->tag_size);
|
||||||
goto beach;
|
goto beach;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (G_UNLIKELY (buffer && GST_BUFFER_SIZE (buffer) != demux->tag_size)) {
|
if (G_UNLIKELY (buffer && GST_BUFFER_SIZE (buffer) != demux->tag_size)) {
|
||||||
GST_WARNING_OBJECT (demux, "partial pull got %d when expecting %d",
|
GST_WARNING_OBJECT (demux,
|
||||||
|
"partial pull got %d when expecting %" G_GUINT64_FORMAT,
|
||||||
GST_BUFFER_SIZE (buffer), demux->tag_size);
|
GST_BUFFER_SIZE (buffer), demux->tag_size);
|
||||||
gst_buffer_unref (buffer);
|
gst_buffer_unref (buffer);
|
||||||
ret = GST_FLOW_UNEXPECTED;
|
ret = GST_FLOW_UNEXPECTED;
|
||||||
|
|
|
@ -474,7 +474,7 @@ gst_flv_parse_tag_audio (GstFLVDemux * demux, const guint8 * data,
|
||||||
caps = gst_caps_new_simple ("audio/x-raw-int", NULL);
|
caps = gst_caps_new_simple ("audio/x-raw-int", NULL);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
GST_WARNING_OBJECT (demux, "unsupported audio codec tag", codec_tag);
|
GST_WARNING_OBJECT (demux, "unsupported audio codec tag %u", codec_tag);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (G_UNLIKELY (!caps)) {
|
if (G_UNLIKELY (!caps)) {
|
||||||
|
@ -541,7 +541,7 @@ gst_flv_parse_tag_audio (GstFLVDemux * demux, const guint8 * data,
|
||||||
caps = gst_caps_new_simple ("audio/x-raw-int", NULL);
|
caps = gst_caps_new_simple ("audio/x-raw-int", NULL);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
GST_WARNING_OBJECT (demux, "unsupported audio codec tag", codec_tag);
|
GST_WARNING_OBJECT (demux, "unsupported audio codec tag %u", codec_tag);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (G_UNLIKELY (!caps)) {
|
if (G_UNLIKELY (!caps)) {
|
||||||
|
@ -930,7 +930,8 @@ gst_flv_parse_tag_type (GstFLVDemux * demux, const guint8 * data,
|
||||||
demux->tag_data_size = FLV_GET_BEUI24 (data + 1, data_size - 1);
|
demux->tag_data_size = FLV_GET_BEUI24 (data + 1, data_size - 1);
|
||||||
demux->tag_size = demux->tag_data_size + 11;
|
demux->tag_size = demux->tag_data_size + 11;
|
||||||
|
|
||||||
GST_LOG_OBJECT (demux, "tag data size is %d", demux->tag_data_size);
|
GST_LOG_OBJECT (demux, "tag data size is %" G_GUINT64_FORMAT,
|
||||||
|
demux->tag_data_size);
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
|
@ -223,7 +223,7 @@ no_channels:
|
||||||
static GstFlowReturn
|
static GstFlowReturn
|
||||||
gst_deinterleave_process (GstDeinterleave * self, GstBuffer * buf)
|
gst_deinterleave_process (GstDeinterleave * self, GstBuffer * buf)
|
||||||
{
|
{
|
||||||
GstFlowReturn ret;
|
GstFlowReturn ret = GST_FLOW_OK; /* initialized to silence a warning */
|
||||||
GList *srcs;
|
GList *srcs;
|
||||||
guint bufsize, i, j, channels, pads_pushed, nframes;
|
guint bufsize, i, j, channels, pads_pushed, nframes;
|
||||||
GstBuffer **buffers_out;
|
GstBuffer **buffers_out;
|
||||||
|
|
|
@ -297,7 +297,7 @@ gst_switch_chain (GstPad * pad, GstBuffer * buf)
|
||||||
"Sending new segment with start of %" G_GUINT64_FORMAT, start);
|
"Sending new segment with start of %" G_GUINT64_FORMAT, start);
|
||||||
} else {
|
} else {
|
||||||
GST_WARNING_OBJECT (gstswitch,
|
GST_WARNING_OBJECT (gstswitch,
|
||||||
"Couldn't find new segment for pad %s:%s in hashtable",
|
"Couldn't find new segment for pad %s in hashtable",
|
||||||
GST_PAD_NAME (pad));
|
GST_PAD_NAME (pad));
|
||||||
}
|
}
|
||||||
/* reset stop and start value */
|
/* reset stop and start value */
|
||||||
|
@ -496,7 +496,7 @@ gst_switch_set_property (GObject * object, guint prop_id,
|
||||||
"Sending new segment with start of %" G_GUINT64_FORMAT, start);
|
"Sending new segment with start of %" G_GUINT64_FORMAT, start);
|
||||||
} else {
|
} else {
|
||||||
GST_WARNING_OBJECT (gstswitch,
|
GST_WARNING_OBJECT (gstswitch,
|
||||||
"Couldn't find new segment for pad %s:%s in hashtable",
|
"Couldn't find new segment for pad %s in hashtable",
|
||||||
GST_PAD_NAME (gstswitch->active_sinkpad));
|
GST_PAD_NAME (gstswitch->active_sinkpad));
|
||||||
}
|
}
|
||||||
/* reset stop and start value */
|
/* reset stop and start value */
|
||||||
|
|
Loading…
Reference in a new issue