From: Tim-Philipp Müller <tim.muller@collabora.co.uk>
Date: Sat, 16 Apr 2011 15:51:32 +0000 (+0100)
Subject: deinterlace, matroska: fix two variable-may-be-used-uninitialized compiler warnings
X-Git-Tag: 1.19.3~509^2~7136^2~621
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c2bc6327cd54b00467fd1ae6763b06de2b3aaab7;p=platform%2Fupstream%2Fgstreamer.git

deinterlace, matroska: fix two variable-may-be-used-uninitialized compiler warnings

We use -DG_DISABLE_ASSERT for the pre-releases, which makes these
warnings pop up in cases that were previously covered by g_assert_not_reached()
and the like:
tvtime/greedyh.c:801:14: warning: 'scanline' may be used uninitialized in this function
matroska-mux.c:501:19: warning: 'context' may be used uninitialized in this function
---

diff --git a/gst/deinterlace/tvtime/greedyh.c b/gst/deinterlace/tvtime/greedyh.c
index bd2794c..d1e4fd6 100644
--- a/gst/deinterlace/tvtime/greedyh.c
+++ b/gst/deinterlace/tvtime/greedyh.c
@@ -749,7 +749,7 @@ deinterlace_frame_di_greedyh_packed (GstDeinterlaceMethod * method,
       break;
     default:
       g_assert_not_reached ();
-      break;
+      return;
   }
 
   // copy first even line no matter what, and the first odd line if we're
diff --git a/gst/matroska/matroska-mux.c b/gst/matroska/matroska-mux.c
index 7be2245..7f94f18 100644
--- a/gst/matroska/matroska-mux.c
+++ b/gst/matroska/matroska-mux.c
@@ -494,7 +494,7 @@ gst_matroska_pad_reset (GstMatroskaPad * collect_pad, gboolean full)
         break;
       default:
         g_assert_not_reached ();
-        break;
+        return;
     }
 
     context->type = type;