mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-11 09:55:36 +00:00
Code Issues 1 Projects Releases Wiki Activity

dshowsrcwrapper: Fixed null caps comparison

Browse source 
https://bugzilla.gnome.org/show_bug.cgi?id=741086
This commit is contained in:
Matthew Bader 2014-12-03 16:13:17 -05:00 committed by Sebastian Dröge
parent c306e0dfa7
commit d627f4b93b
2 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
sys/dshowsrcwrapper/gstdshowaudiosrc.cpp
View file

@ -454,12 +454,13 @@ gst_dshowaudiosrc_prepare (GstAudioSrc * asrc, GstAudioRingBufferSpec * spec)
GstDshowAudioSrc *src = GST_DSHOWAUDIOSRC (asrc); GstDshowAudioSrc *src = GST_DSHOWAUDIOSRC (asrc);
GstCaps *current_caps = gst_pad_get_current_caps (GST_BASE_SRC_PAD (asrc)); GstCaps *current_caps = gst_pad_get_current_caps (GST_BASE_SRC_PAD (asrc));
if (gst_caps_is_equal (spec->caps, current_caps)) { if (current_caps) {
if (gst_caps_is_equal (spec->caps, current_caps)) {
gst_caps_unref (current_caps);
return TRUE;
}
gst_caps_unref (current_caps); gst_caps_unref (current_caps);
return TRUE;
} }
gst_caps_unref (current_caps);
/* In 1.0, prepare() seems to be called in the PLAYING state. Most /* In 1.0, prepare() seems to be called in the PLAYING state. Most
of the time you can't do much on a running graph. */ of the time you can't do much on a running graph. */

8
sys/dshowsrcwrapper/gstdshowvideosrc.cpp
View file

@ -578,11 +578,13 @@ gst_dshowvideosrc_set_caps (GstBaseSrc * bsrc, GstCaps * caps)
GstStructure *s = gst_caps_get_structure (caps, 0); GstStructure *s = gst_caps_get_structure (caps, 0);
GstCaps *current_caps = gst_pad_get_current_caps (GST_BASE_SRC_PAD (bsrc)); GstCaps *current_caps = gst_pad_get_current_caps (GST_BASE_SRC_PAD (bsrc));
if (gst_caps_is_equal (caps, current_caps)) { if (current_caps) {
if (gst_caps_is_equal (caps, current_caps)) {
gst_caps_unref (current_caps);
return TRUE;
}
gst_caps_unref (current_caps); gst_caps_unref (current_caps);
return TRUE;
} }
gst_caps_unref (current_caps);
/* Same remark as in gstdshowaudiosrc. */ /* Same remark as in gstdshowaudiosrc. */
gboolean was_running = src->is_running; gboolean was_running = src->is_running;