diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | gst/avi/gstavidemux.c | 6 |
2 files changed, 13 insertions, 0 deletions
@@ -1,5 +1,12 @@ 2008-10-15 Edward Hervey <edward.hervey@collabora.co.uk> + * gst/avi/gstavidemux.c: (gst_avi_demux_stream_scan): + Skip entries for streams that don't have a output pad yet, thereby + avoiding calling pad functions with a NULL pad. + Fixes #556424 + +2008-10-15 Edward Hervey <edward.hervey@collabora.co.uk> + * gst/qtdemux/qtdemux.c: Remove previous wrong commit * tests/check/elements/icydemux.c: (icydemux_found_pad): Remove problematic and useless refcount check. diff --git a/gst/avi/gstavidemux.c b/gst/avi/gstavidemux.c index 255f5353..62313e5a 100644 --- a/gst/avi/gstavidemux.c +++ b/gst/avi/gstavidemux.c @@ -2330,6 +2330,12 @@ gst_avi_demux_stream_scan (GstAviDemux * avi, } stream = &avi->stream[stream_nr]; + if (stream->pad == NULL) { + GST_WARNING_OBJECT (avi, + "Stream %d does not have an output pad, can't create new index", + stream_nr); + goto next; + } /* pre-allocate */ if (index_size % 1024 == 0) { |