From fb67a0d126575b43d536ab265f6dc09e06609b58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim.muller@collabora.co.uk>
Date: Thu, 14 Apr 2011 16:49:18 +0100
Subject: [PATCH] basevideo: fix unused-but-set-variable warnings with gcc 4.6

---
 gst-libs/gst/video/gstbasevideocodec.c   |  5 -----
 gst-libs/gst/video/gstbasevideodecoder.c | 13 -------------
 gst-libs/gst/video/gstbasevideoencoder.c | 12 +-----------
 3 files changed, 1 insertion(+), 29 deletions(-)

diff --git a/gst-libs/gst/video/gstbasevideocodec.c b/gst-libs/gst/video/gstbasevideocodec.c
index 39a13898a6..1b7d784fcf 100644
--- a/gst-libs/gst/video/gstbasevideocodec.c
+++ b/gst-libs/gst/video/gstbasevideocodec.c
@@ -130,11 +130,6 @@ gst_base_video_codec_reset (GstBaseVideoCodec * base_video_codec)
 static void
 gst_base_video_codec_finalize (GObject * object)
 {
-  GstBaseVideoCodec *base_video_codec;
-
-  g_return_if_fail (GST_IS_BASE_VIDEO_CODEC (object));
-  base_video_codec = GST_BASE_VIDEO_CODEC (object);
-
   G_OBJECT_CLASS (parent_class)->finalize (object);
 }
 
diff --git a/gst-libs/gst/video/gstbasevideodecoder.c b/gst-libs/gst/video/gstbasevideodecoder.c
index 807aeefc67..4eb0ed5af5 100644
--- a/gst-libs/gst/video/gstbasevideodecoder.c
+++ b/gst-libs/gst/video/gstbasevideodecoder.c
@@ -178,11 +178,8 @@ static void
 gst_base_video_decoder_finalize (GObject * object)
 {
   GstBaseVideoDecoder *base_video_decoder;
-  GstBaseVideoDecoderClass *base_video_decoder_class;
 
-  g_return_if_fail (GST_IS_BASE_VIDEO_DECODER (object));
   base_video_decoder = GST_BASE_VIDEO_DECODER (object);
-  base_video_decoder_class = GST_BASE_VIDEO_DECODER_GET_CLASS (object);
 
   gst_base_video_decoder_reset (base_video_decoder);
 
@@ -980,7 +977,6 @@ GstFlowReturn
 gst_base_video_decoder_finish_frame (GstBaseVideoDecoder * base_video_decoder,
     GstVideoFrame * frame)
 {
-  GstBaseVideoDecoderClass *base_video_decoder_class;
   GstVideoState *state = &GST_BASE_VIDEO_CODEC (base_video_decoder)->state;
   GstBuffer *src_buffer;
 
@@ -990,9 +986,6 @@ gst_base_video_decoder_finish_frame (GstBaseVideoDecoder * base_video_decoder,
       gst_adapter_available (base_video_decoder->input_adapter),
       gst_adapter_available (base_video_decoder->output_adapter));
 
-  base_video_decoder_class =
-      GST_BASE_VIDEO_DECODER_GET_CLASS (base_video_decoder);
-
   GST_DEBUG ("finish frame sync=%d pts=%" GST_TIME_FORMAT, frame->is_sync_point,
       GST_TIME_ARGS (frame->presentation_timestamp));
 
@@ -1135,13 +1128,7 @@ GstFlowReturn
 gst_base_video_decoder_skip_frame (GstBaseVideoDecoder * base_video_decoder,
     GstVideoFrame * frame)
 {
-  GstBaseVideoDecoderClass *base_video_decoder_class;
-
   GST_DEBUG ("finish frame");
-
-  base_video_decoder_class =
-      GST_BASE_VIDEO_DECODER_GET_CLASS (base_video_decoder);
-
   GST_DEBUG ("finish frame sync=%d pts=%" GST_TIME_FORMAT, frame->is_sync_point,
       GST_TIME_ARGS (frame->presentation_timestamp));
 
diff --git a/gst-libs/gst/video/gstbasevideoencoder.c b/gst-libs/gst/video/gstbasevideoencoder.c
index b4b7e30c6a..c36b700886 100644
--- a/gst-libs/gst/video/gstbasevideoencoder.c
+++ b/gst-libs/gst/video/gstbasevideoencoder.c
@@ -149,14 +149,7 @@ gst_base_video_encoder_sink_setcaps (GstPad * pad, GstCaps * caps)
 static void
 gst_base_video_encoder_finalize (GObject * object)
 {
-  GstBaseVideoEncoder *base_video_encoder;
-  GstBaseVideoEncoderClass *base_video_encoder_class;
-
-  g_return_if_fail (GST_IS_BASE_VIDEO_ENCODER (object));
-  base_video_encoder = GST_BASE_VIDEO_ENCODER (object);
-  base_video_encoder_class = GST_BASE_VIDEO_ENCODER_GET_CLASS (object);
-
-  GST_DEBUG ("finalize");
+  GST_DEBUG_OBJECT (object, "finalize");
 
   G_OBJECT_CLASS (parent_class)->finalize (object);
 }
@@ -255,12 +248,9 @@ static gboolean
 gst_base_video_encoder_src_event (GstPad * pad, GstEvent * event)
 {
   GstBaseVideoEncoder *base_video_encoder;
-  GstBaseVideoEncoderClass *base_video_encoder_class;
   gboolean ret = FALSE;
 
   base_video_encoder = GST_BASE_VIDEO_ENCODER (gst_pad_get_parent (pad));
-  base_video_encoder_class =
-      GST_BASE_VIDEO_ENCODER_GET_CLASS (base_video_encoder);
 
   switch (GST_EVENT_TYPE (event)) {
     case GST_EVENT_CUSTOM_UPSTREAM: