FaSTTUBe/GST-Tensordecoder-ov_ep
61
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

avidemux: only use stream's pad after having checked it exists

Browse Source
This commit is contained in:
Mark Nauwelaerts 2009-08-04 19:45:43 +02:00
parent 4249f52c6c
commit f67db2a089
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gst/avi/gstavidemux.c
View File

@ -4242,11 +4242,7 @@ gst_avi_demux_stream_data (GstAviDemux * avi)
GST_BUFFER_SIZE (buf) = size; GST_BUFFER_SIZE (buf) = size;
avi->offset += 8 + ((size + 1) & ~1); avi->offset += 8 + ((size + 1) & ~1);
/* get time of this buffer */
stream = &avi->stream[stream_nr]; stream = &avi->stream[stream_nr];
gst_pad_query_position (stream->pad, &format, (gint64 *) & next_ts);
if (G_UNLIKELY (format != GST_FORMAT_TIME))
goto wrong_format;
/* set delay (if any) /* set delay (if any)
if (stream->strh->init_frames == stream->current_frame && if (stream->strh->init_frames == stream->current_frame &&
@ -4257,12 +4253,19 @@ gst_avi_demux_stream_data (GstAviDemux * avi)
stream->current_frame++; stream->current_frame++;
stream->current_byte += size; stream->current_byte += size;
/* parsing of corresponding header may have failed */
if (G_UNLIKELY (!stream->pad)) { if (G_UNLIKELY (!stream->pad)) {
GST_WARNING ("No pad."); GST_WARNING_OBJECT (avi, "no pad for stream ID %" GST_FOURCC_FORMAT,
GST_FOURCC_ARGS (tag));
gst_buffer_unref (buf); gst_buffer_unref (buf);
} else { } else {
GstClockTime dur_ts = 0; GstClockTime dur_ts = 0;
/* get time of this buffer */
gst_pad_query_position (stream->pad, &format, (gint64 *) & next_ts);
if (G_UNLIKELY (format != GST_FORMAT_TIME))
goto wrong_format;
/* invert the picture if needed */ /* invert the picture if needed */
buf = gst_avi_demux_invert (stream, buf); buf = gst_avi_demux_invert (stream, buf);