diff options
| author | Sebastian Dröge <slomo@circular-chaos.org> | 2007-12-29 17:31:49 +0000 |
|---|---|---|
| committer | Sebastian Dröge <slomo@circular-chaos.org> | 2007-12-29 17:31:49 +0000 |
| commit | 73cc44a5e858d15ccff2893f042b9bebd7c05bd7 (patch) | |
| tree | 905f67bd5b07c09fd3b0066c3adf60eca7a15ef8 /ext | |
| parent | d56ba2c7806884e3c4a94cf5bde67e2482dc216a (diff) | |
| download | gst-plugins-bad-73cc44a5e858d15ccff2893f042b9bebd7c05bd7.tar.gz gst-plugins-bad-73cc44a5e858d15ccff2893f042b9bebd7c05bd7.tar.bz2 gst-plugins-bad-73cc44a5e858d15ccff2893f042b9bebd7c05bd7.zip | |
Fix 'xyz may be used uninitialized' compiler warnings caused by broken g_assert_not_reached() macro in GLib-2.15.x an...
Original commit message from CVS:
* ext/ladspa/gstladspa.c: (gst_ladspa_get_property):
* ext/sdl/sdlvideosink.c: (gst_sdlvideosink_show_frame):
* gst/mve/gstmvemux.c: (gst_mve_mux_request_new_pad):
* sys/dvb/dvbbasebin.c: (dvb_base_bin_class_init):
Fix 'xyz may be used uninitialized' compiler warnings caused
by broken g_assert_not_reached() macro in GLib-2.15.x and don't
abort() in any case but properly report the error.
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/ladspa/gstladspa.c | 4 | ||||
| -rw-r--r-- | ext/sdl/sdlvideosink.c | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/ext/ladspa/gstladspa.c b/ext/ladspa/gstladspa.c index d8525d82..1fd42c9f 100644 --- a/ext/ladspa/gstladspa.c +++ b/ext/ladspa/gstladspa.c @@ -424,7 +424,7 @@ gst_ladspa_get_property (GObject * object, guint prop_id, GValue * value, controls = gsp->control_out; prop_id -= gsp_class->num_control_in; } else { - g_assert_not_reached (); + g_return_if_reached (); } /* now see what type it is */ @@ -439,7 +439,7 @@ gst_ladspa_get_property (GObject * object, guint prop_id, GValue * value, g_value_set_float (value, controls[prop_id]); break; default: - g_assert_not_reached (); + g_return_if_reached (); } } diff --git a/ext/sdl/sdlvideosink.c b/ext/sdl/sdlvideosink.c index 4664c219..321b7e89 100644 --- a/ext/sdl/sdlvideosink.c +++ b/ext/sdl/sdlvideosink.c @@ -778,7 +778,9 @@ gst_sdlvideosink_show_frame (GstBaseSink * bsink, GstBuffer * buf) v = y + I420_V_OFFSET (sdlvideosink->width, sdlvideosink->height); break; default: - g_assert_not_reached (); + gst_sdlvideosink_unlock (sdlvideosink); + g_mutex_unlock (sdlvideosink->lock); + g_return_val_if_reached (GST_FLOW_ERROR); } /* Y Plane */ |