From be597896646eea46c32549baae5bfb3ff03ccbc3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim.muller@collabora.co.uk>
Date: Wed, 13 Apr 2011 23:57:56 +0100
Subject: [PATCH] ogg: fix unused-but-set-variable warnings with gcc 4.6

https://bugzilla.gnome.org/show_bug.cgi?id=647294
---
 ext/ogg/gstoggdemux.c  |  2 --
 ext/ogg/gstoggmux.c    |  4 +---
 ext/ogg/gstoggstream.c | 12 ------------
 3 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/ext/ogg/gstoggdemux.c b/ext/ogg/gstoggdemux.c
index c01166502d..67d232137c 100644
--- a/ext/ogg/gstoggdemux.c
+++ b/ext/ogg/gstoggdemux.c
@@ -3087,14 +3087,12 @@ gst_ogg_demux_handle_page (GstOggDemux * ogg, ogg_page * page)
       pad = gst_ogg_demux_find_pad (ogg, serialno);
     } else {
       GstClockTime chain_time;
-      GstOggChain *current_chain;
       gint64 current_time;
 
       /* this can only happen in push mode */
       if (ogg->pullmode)
         goto unknown_chain;
 
-      current_chain = ogg->current_chain;
       current_time = ogg->segment.last_stop;
 
       /* time of new chain is current time */
diff --git a/ext/ogg/gstoggmux.c b/ext/ogg/gstoggmux.c
index fc0aad248f..9f3047f659 100644
--- a/ext/ogg/gstoggmux.c
+++ b/ext/ogg/gstoggmux.c
@@ -881,7 +881,6 @@ gst_ogg_mux_queue_pads (GstOggMux * ogg_mux)
         GST_DEBUG_OBJECT (data->pad, "EOS on pad");
         if (!pad->eos) {
           ogg_page page;
-          GstFlowReturn ret;
 
           /* it's no longer active */
           ogg_mux->active_pads--;
@@ -891,8 +890,7 @@ gst_ogg_mux_queue_pads (GstOggMux * ogg_mux)
 
           while (ogg_stream_flush (&pad->map.stream, &page)) {
             /* Place page into the per-pad queue */
-            ret = gst_ogg_mux_pad_queue_page (ogg_mux, pad, &page,
-                pad->first_delta);
+            gst_ogg_mux_pad_queue_page (ogg_mux, pad, &page, pad->first_delta);
             /* increment the page number counter */
             pad->pageno++;
             /* mark other pages as delta */
diff --git a/ext/ogg/gstoggstream.c b/ext/ogg/gstoggstream.c
index caa986513e..3ef2fd00f5 100644
--- a/ext/ogg/gstoggstream.c
+++ b/ext/ogg/gstoggstream.c
@@ -501,22 +501,16 @@ setup_dirac_mapper (GstOggStream * pad, ogg_packet * packet)
 static gboolean
 is_keyframe_dirac (GstOggStream * pad, gint64 granulepos)
 {
-  gint64 pt;
   int dist_h;
   int dist_l;
   int dist;
-  int delay;
-  gint64 dt;
 
   if (granulepos == -1)
     return -1;
 
-  pt = ((granulepos >> 22) + (granulepos & OGG_DIRAC_GRANULE_LOW_MASK)) >> 9;
   dist_h = (granulepos >> 22) & 0xff;
   dist_l = granulepos & 0xff;
   dist = (dist_h << 8) | dist_l;
-  delay = (granulepos >> 9) & 0x1fff;
-  dt = pt - delay;
 
   return (dist == 0);
 }
@@ -525,16 +519,10 @@ static gint64
 granulepos_to_granule_dirac (GstOggStream * pad, gint64 gp)
 {
   gint64 pt;
-  int dist_h;
-  int dist_l;
-  int dist;
   int delay;
   gint64 dt;
 
   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;
   dt = pt - delay;