mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-18 12:15:19 +00:00
Code Issues 1 Projects Releases Wiki Activity

quicktime: Remove unused but set variables

Browse source 
GCC 4.6.x spits warnings about such variable usage. Note that some
calculations are left as comments for informative purposes.
This commit is contained in:
Robert Swain 2011-04-15 11:29:30 +02:00 committed by Tim-Philipp Müller
parent d596c2e926
commit 1c6e8682ec
3 changed files with 10 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
gst/quicktime/descriptors.c
View file

@ -416,13 +416,12 @@ guint64
desc_es_descriptor_copy_data (ESDescriptor * desc, guint8 ** buffer, desc_es_descriptor_copy_data (ESDescriptor * desc, guint8 ** buffer,
guint64 * size, guint64 * offset) guint64 * size, guint64 * offset)
{ {
guint64 desc_size;
guint64 original_offset = *offset; guint64 original_offset = *offset;
/* must call this twice to have size fields of all contained descriptors set /* must call this twice to have size fields of all contained descriptors set
* correctly, and to have the size of the size fields taken into account */ * correctly, and to have the size of the size fields taken into account */
desc_size = desc_es_descriptor_get_size (desc); desc_es_descriptor_get_size (desc);
desc_size = desc_es_descriptor_get_size (desc); desc_es_descriptor_get_size (desc);
if (!desc_base_descriptor_copy_data (&desc->base, buffer, size, offset)) { if (!desc_base_descriptor_copy_data (&desc->base, buffer, size, offset)) {
return 0; return 0;

15
gst/quicktime/gstrtpxqtdepay.c
View file

@ -277,7 +277,6 @@ gst_rtp_xqt_depay_process (GstBaseRTPDepayload * depayload, GstBuffer * buf)
gint payload_len; gint payload_len;
guint avail; guint avail;
guint8 *payload; guint8 *payload;
guint32 timestamp;
guint8 ver, pck; guint8 ver, pck;
gboolean s, q, l, d; gboolean s, q, l, d;
@ -335,7 +334,9 @@ gst_rtp_xqt_depay_process (GstBaseRTPDepayload * depayload, GstBuffer * buf)
gboolean k, f, a, z; gboolean k, f, a, z;
guint pdlen, pdpadded; guint pdlen, pdpadded;
gint padding; gint padding;
guint32 media_type, timescale; /* media_type only used for printing */
guint32 G_GNUC_UNUSED media_type;
guint32 timescale;
/* 1 2 3 /* 1 2 3
* 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 * 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
@ -537,7 +538,6 @@ gst_rtp_xqt_depay_process (GstBaseRTPDepayload * depayload, GstBuffer * buf)
payload_len -= padding; payload_len -= padding;
} }
timestamp = gst_rtp_buffer_get_timestamp (buf);
rtpxqtdepay->previous_id = rtpxqtdepay->current_id; rtpxqtdepay->previous_id = rtpxqtdepay->current_id;
switch (pck) { switch (pck) {
@ -550,7 +550,7 @@ gst_rtp_xqt_depay_process (GstBaseRTPDepayload * depayload, GstBuffer * buf)
} }
case 2: case 2:
{ {
guint slen, timestamp; guint slen;
/* multiple samples per packet. /* multiple samples per packet.
* 1 2 3 * 1 2 3
@ -574,9 +574,10 @@ gst_rtp_xqt_depay_process (GstBaseRTPDepayload * depayload, GstBuffer * buf)
while (payload_len > 8) { while (payload_len > 8) {
s = (payload[0] & 0x80) != 0; /* contains sync sample */ s = (payload[0] & 0x80) != 0; /* contains sync sample */
slen = (payload[2] << 8) | payload[3]; slen = (payload[2] << 8) | payload[3];
timestamp = /* timestamp =
(payload[4] << 24) | (payload[5] << 16) | (payload[6] << 8) | * (payload[4] << 24) | (payload[5] << 16) | (payload[6] << 8) |
payload[7]; * payload[7];
*/
payload += 8; payload += 8;
payload_len -= 8; payload_len -= 8;

6
gst/quicktime/qtdemux.c
View file

@ -4139,16 +4139,12 @@ gst_qtdemux_chain (GstPad * sinkpad, GstBuffer * inbuf)
} }
if (demux->mdatbuffer && demux->n_streams) { if (demux->mdatbuffer && demux->n_streams) {
GstBuffer *buf;
/* the mdat was before the header */ /* the mdat was before the header */
GST_DEBUG_OBJECT (demux, "We have n_streams:%d and mdatbuffer:%p", GST_DEBUG_OBJECT (demux, "We have n_streams:%d and mdatbuffer:%p",
demux->n_streams, demux->mdatbuffer); demux->n_streams, demux->mdatbuffer);
/* restore our adapter/offset view of things with upstream; /* restore our adapter/offset view of things with upstream;
* put preceding buffered data ahead of current moov data. * put preceding buffered data ahead of current moov data.
* This should also handle evil mdat, moov, mdat cases and alike */ * This should also handle evil mdat, moov, mdat cases and alike */
buf = gst_adapter_take_buffer (demux->adapter,
gst_adapter_available (demux->adapter));
gst_adapter_clear (demux->adapter); gst_adapter_clear (demux->adapter);
demux->mdatbuffer = NULL; demux->mdatbuffer = NULL;
demux->offset = demux->mdatoffset; demux->offset = demux->mdatoffset;
@ -6045,7 +6041,6 @@ end:
static gchar * static gchar *
qtdemux_get_rtsp_uri_from_hndl (GstQTDemux * qtdemux, GNode * minf) qtdemux_get_rtsp_uri_from_hndl (GstQTDemux * qtdemux, GNode * minf)
{ {
GNode *hndl;
GNode *dinf; GNode *dinf;
GstByteReader dref; GstByteReader dref;
gchar *uri = NULL; gchar *uri = NULL;
@ -6065,7 +6060,6 @@ qtdemux_get_rtsp_uri_from_hndl (GstQTDemux * qtdemux, GNode * minf)
gst_byte_reader_skip (&dref, 4) && gst_byte_reader_skip (&dref, 4) &&
gst_byte_reader_get_uint32_be (&dref, &dref_num_entries)) { gst_byte_reader_get_uint32_be (&dref, &dref_num_entries)) {
gint i; gint i;
hndl = NULL;
/* search dref entries for hndl atom */ /* search dref entries for hndl atom */
for (i = 0; i < dref_num_entries; i++) { for (i = 0; i < dref_num_entries; i++) {