summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRonald S. Bultje <rbultje@ronald.bitfreak.net>2004-12-01 17:58:19 +0000
committerRonald S. Bultje <rbultje@ronald.bitfreak.net>2004-12-01 17:58:19 +0000
commit795615d52e52f46cf20be820d1b7b59ba1c265bc (patch)
treee03df5e4d6e5aa6280a85fc261be16004d73e976
parent54effec909160b506e0e474f28b3c1f86e045052 (diff)
downloadgstreamer-plugins-base-795615d52e52f46cf20be820d1b7b59ba1c265bc.tar.gz
gst/playback/gstplaybasebin.c: Don't crash on EMPTY caps (e.g. when the demuxer didn't recognize the contained stream).
Original commit message from CVS: * gst/playback/gstplaybasebin.c: (gst_play_base_bin_change_state): Don't crash on EMPTY caps (e.g. when the demuxer didn't recognize the contained stream).
-rw-r--r--ChangeLog6
-rw-r--r--gst/playback/gstplaybasebin.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ac117770e..f9260148e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2004-12-01 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
+ * gst/playback/gstplaybasebin.c: (gst_play_base_bin_change_state):
+ Don't crash on EMPTY caps (e.g. when the demuxer didn't recognize
+ the contained stream).
+
+2004-12-01 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
+
* ext/faad/gstfaad.c: (gst_faad_srcconnect), (gst_faad_chain):
Oops, remove debug.
diff --git a/gst/playback/gstplaybasebin.c b/gst/playback/gstplaybasebin.c
index 59e67a401..63522e6ac 100644
--- a/gst/playback/gstplaybasebin.c
+++ b/gst/playback/gstplaybasebin.c
@@ -1207,7 +1207,7 @@ gst_play_base_bin_change_state (GstElement * element)
/* We're no audio/video and the only stream... We could
* be something not-media that's detected because then our
* typefind doesn't mess up with mp3 (bz2, gz, elf, ...) */
- if (info->caps) {
+ if (info->caps && !gst_caps_is_empty (info->caps)) {
const gchar *mime =
gst_structure_get_name (gst_caps_get_structure (info->caps,
0));