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

ogg: fix unused-but-set-variable warnings with gcc 4.6

Browse source 
https://bugzilla.gnome.org/show_bug.cgi?id=647294
This commit is contained in:
Tim-Philipp Müller 2011-04-13 23:57:56 +01:00
parent f14c73cbfd
commit be59789664
3 changed files with 1 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ext/ogg/gstoggdemux.c
View file

@ -3087,14 +3087,12 @@ gst_ogg_demux_handle_page (GstOggDemux * ogg, ogg_page * page)
pad = gst_ogg_demux_find_pad (ogg, serialno); pad = gst_ogg_demux_find_pad (ogg, serialno);
} else { } else {
GstClockTime chain_time; GstClockTime chain_time;
GstOggChain *current_chain;
gint64 current_time; gint64 current_time;
/* this can only happen in push mode */ /* this can only happen in push mode */
if (ogg->pullmode) if (ogg->pullmode)
goto unknown_chain; goto unknown_chain;
current_chain = ogg->current_chain;
current_time = ogg->segment.last_stop; current_time = ogg->segment.last_stop;
/* time of new chain is current time */ /* time of new chain is current time */

4
ext/ogg/gstoggmux.c
View file

@ -881,7 +881,6 @@ gst_ogg_mux_queue_pads (GstOggMux * ogg_mux)
GST_DEBUG_OBJECT (data->pad, "EOS on pad"); GST_DEBUG_OBJECT (data->pad, "EOS on pad");
if (!pad->eos) { if (!pad->eos) {
ogg_page page; ogg_page page;
GstFlowReturn ret;
/* it's no longer active */ /* it's no longer active */
ogg_mux->active_pads--; ogg_mux->active_pads--;
@ -891,8 +890,7 @@ gst_ogg_mux_queue_pads (GstOggMux * ogg_mux)
while (ogg_stream_flush (&pad->map.stream, &page)) { while (ogg_stream_flush (&pad->map.stream, &page)) {
/* Place page into the per-pad queue */ /* Place page into the per-pad queue */
ret = gst_ogg_mux_pad_queue_page (ogg_mux, pad, &page, gst_ogg_mux_pad_queue_page (ogg_mux, pad, &page, pad->first_delta);
pad->first_delta);
/* increment the page number counter */ /* increment the page number counter */
pad->pageno++; pad->pageno++;
/* mark other pages as delta */ /* mark other pages as delta */

12
ext/ogg/gstoggstream.c
View file

@ -501,22 +501,16 @@ setup_dirac_mapper (GstOggStream * pad, ogg_packet * packet)
static gboolean static gboolean
is_keyframe_dirac (GstOggStream * pad, gint64 granulepos) is_keyframe_dirac (GstOggStream * pad, gint64 granulepos)
{ {
gint64 pt;
int dist_h; int dist_h;
int dist_l; int dist_l;
int dist; int dist;
int delay;
gint64 dt;
if (granulepos == -1) if (granulepos == -1)
return -1; return -1;
pt = ((granulepos >> 22) + (granulepos & OGG_DIRAC_GRANULE_LOW_MASK)) >> 9;
dist_h = (granulepos >> 22) & 0xff; dist_h = (granulepos >> 22) & 0xff;
dist_l = granulepos & 0xff; dist_l = granulepos & 0xff;
dist = (dist_h << 8) | dist_l; dist = (dist_h << 8) | dist_l;
delay = (granulepos >> 9) & 0x1fff;
dt = pt - delay;
return (dist == 0); return (dist == 0);
} }
@ -525,16 +519,10 @@ static gint64
granulepos_to_granule_dirac (GstOggStream * pad, gint64 gp) granulepos_to_granule_dirac (GstOggStream * pad, gint64 gp)
{ {
gint64 pt; gint64 pt;
int dist_h;
int dist_l;
int dist;
int delay; int delay;
gint64 dt; gint64 dt;
pt = ((gp >> 22) + (gp & OGG_DIRAC_GRANULE_LOW_MASK)) >> 9; pt = ((gp >> 22) + (gp & OGG_DIRAC_GRANULE_LOW_MASK)) >> 9;
dist_h = (gp >> 22) & 0xff;
dist_l = gp & 0xff;
dist = (dist_h << 8) | dist_l;
delay = (gp >> 9) & 0x1fff; delay = (gp >> 9) & 0x1fff;
dt = pt - delay; dt = pt - delay;