summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim-Philipp Müller <tim.muller@collabora.co.uk>2011-04-16 16:51:32 +0100
committerTim-Philipp Müller <tim.muller@collabora.co.uk>2011-04-16 16:51:32 +0100
commitc2bc6327cd54b00467fd1ae6763b06de2b3aaab7 (patch)
tree298d8413e467931232fa12b82ed2f7f5c20b1923
parenta068133ee767fb4e08bd93e4a0475ec96bd0f266 (diff)
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
-rw-r--r--gst/deinterlace/tvtime/greedyh.c2
-rw-r--r--gst/matroska/matroska-mux.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/gst/deinterlace/tvtime/greedyh.c b/gst/deinterlace/tvtime/greedyh.c
index bd2794cb3..d1e4fd6b1 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 7be224555..7f94f1871 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;