diff options
| author | Benjamin Otte <otte@gnome.org> | 2004-08-03 14:28:12 +0000 |
|---|---|---|
| committer | Benjamin Otte <otte@gnome.org> | 2004-08-03 14:28:12 +0000 |
| commit | c870aeb9ce9ea891abe98b24ed53c71ceecce5ad (patch) | |
| tree | 2893984a343c349b609da092bbcd855f33791c76 /ext | |
| parent | 3a7e84664890ba9c3dc2e08b9248a127d03d056b (diff) | |
| download | gst-plugins-bad-c870aeb9ce9ea891abe98b24ed53c71ceecce5ad.tar.gz gst-plugins-bad-c870aeb9ce9ea891abe98b24ed53c71ceecce5ad.tar.bz2 gst-plugins-bad-c870aeb9ce9ea891abe98b24ed53c71ceecce5ad.zip | |
fixes for G_DISABLE_ASSERT and friends
Original commit message from CVS:
* examples/dynparams/filter.c: (ui_control_create):
* examples/gstplay/player.c: (print_tag):
* ext/alsa/gstalsa.c: (gst_alsa_request_new_pad):
* ext/gdk_pixbuf/gstgdkanimation.c:
(gst_gdk_animation_iter_may_advance):
* ext/jack/gstjack.c: (gst_jack_request_new_pad):
* ext/mad/gstid3tag.c: (gst_mad_id3_to_tag_list),
(tag_list_to_id3_tag_foreach), (gst_id3_tag_handle_event):
* ext/vorbis/oggvorbisenc.c: (gst_oggvorbisenc_get_tag_value):
* ext/vorbis/vorbisenc.c: (gst_vorbisenc_get_tag_value):
* ext/xine/xineaudiodec.c: (gst_xine_audio_dec_chain):
* gst-libs/gst/media-info/media-info-test.c: (print_tag):
* gst/sine/demo-dparams.c: (main):
* gst/tags/gstvorbistag.c: (gst_tag_to_vorbis_comments):
* testsuite/alsa/formats.c: (create_pipeline):
* testsuite/alsa/sinesrc.c: (sinesrc_force_caps), (sinesrc_get):
fixes for G_DISABLE_ASSERT and friends
* gst/typefind/gsttypefindfunctions.c: (aac_type_find),
(mp3_type_frame_length_from_header), (mp3_type_find),
(plugin_init):
require mp3 typefinding to have at least MIN_HEADERS valid headers
add typefinding for AAC adts files
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/jack/gstjack.c | 3 | ||||
| -rw-r--r-- | ext/xine/xineaudiodec.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/ext/jack/gstjack.c b/ext/jack/gstjack.c index 8b1296ea..58678f87 100644 --- a/ext/jack/gstjack.c +++ b/ext/jack/gstjack.c @@ -308,7 +308,8 @@ gst_jack_request_new_pad (GstElement * element, GstPadTemplate * templ, GstJackPad *pad; gint count; - g_return_val_if_fail ((this = GST_JACK (element)), NULL); + g_return_val_if_fail (GST_IS_JACK (element), NULL); + this = GST_JACK (element); if (!this->bin) pad_list = &this->pads; diff --git a/ext/xine/xineaudiodec.c b/ext/xine/xineaudiodec.c index a0a19f21..dee0242f 100644 --- a/ext/xine/xineaudiodec.c +++ b/ext/xine/xineaudiodec.c @@ -328,7 +328,7 @@ gst_xine_audio_dec_chain (GstPad * pad, GstData * in) xine->decoder->decode_data (xine->decoder, &element); /* send stsd emulation to the decoder */ /* FIXME: qdm2 only right now */ - g_assert (gst_pad_get_negotiated_caps (xine->sinkpad)); + g_assert (gst_pad_is_negotiated (xine->sinkpad)); structure = gst_caps_get_structure (gst_pad_get_negotiated_caps (xine->sinkpad), 0); *((guint32 *) & stsd[56]) = GUINT32_TO_BE (12); |