From e572214cc175e68bdf4e249ea92317d9d475a521 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Fri, 16 Jul 2004 10:50:49 +0000 Subject: [PATCH] gst/: Make sure we don't create 0 sized subbufers in riff-read. Original commit message from CVS: * gst-libs/gst/riff/riff-read.c: (gst_riff_read_strf_vids_with_data), (gst_riff_read_strf_auds_with_data): * gst/avi/gstavidemux.c: (gst_avi_demux_handle_src_query), (gst_avi_demux_add_stream), (gst_avi_demux_stream_header): Make sure we don't create 0 sized subbufers in riff-read. Signal the no more pads signal after reading the avi header. --- gst-libs/gst/riff/riff-read.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/gst-libs/gst/riff/riff-read.c b/gst-libs/gst/riff/riff-read.c index 405324ab80..11740f2ae7 100644 --- a/gst-libs/gst/riff/riff-read.c +++ b/gst-libs/gst/riff/riff-read.c @@ -551,8 +551,12 @@ gst_riff_read_strf_vids_with_data (GstRiffRead * riff, strf->size, GST_BUFFER_SIZE (buf)); strf->size = GST_BUFFER_SIZE (buf); } else if (strf->size < GST_BUFFER_SIZE (buf)) { - *extradata = gst_buffer_create_sub (buf, strf->size + 2, - GST_BUFFER_SIZE (buf) - strf->size - 2); + gint len; + + len = GST_BUFFER_SIZE (buf) - strf->size - 2; + if (len > 0) { + *extradata = gst_buffer_create_sub (buf, strf->size + 2, len); + } } /* debug */ @@ -636,8 +640,12 @@ gst_riff_read_strf_auds_with_data (GstRiffRead * riff, strf->size, GST_BUFFER_SIZE (buf)); strf->size = GST_BUFFER_SIZE (buf); } else if (strf->size < GST_BUFFER_SIZE (buf)) { - *extradata = gst_buffer_create_sub (buf, strf->size + 2, - GST_BUFFER_SIZE (buf) - strf->size - 2); + gint len; + + len = GST_BUFFER_SIZE (buf) - strf->size - 2; + if (len > 0) { + *extradata = gst_buffer_create_sub (buf, strf->size + 2, len); + } } /* debug */