mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-10-02 16:52:42 +00:00
ext/ffmpeg/gstffmpegdemux.c: Don't try handling a buffer if downstream allocation failed.
Original commit message from CVS: * ext/ffmpeg/gstffmpegdemux.c: (gst_ffmpegdemux_loop): Don't try handling a buffer if downstream allocation failed. Avoids crashes and Fixes #515205
This commit is contained in:
parent
7d3fa2df4b
commit
d5df61ccb7
3 changed files with 12 additions and 2 deletions
|
@ -1,3 +1,9 @@
|
||||||
|
2008-02-08 Edward Hervey <edward.hervey@collabora.co.uk>
|
||||||
|
|
||||||
|
* ext/ffmpeg/gstffmpegdemux.c: (gst_ffmpegdemux_loop):
|
||||||
|
Don't try handling a buffer if downstream allocation failed.
|
||||||
|
Avoids crashes and Fixes #515205
|
||||||
|
|
||||||
2008-01-29 Wim Taymans <wim.taymans@collabora.co.uk>
|
2008-01-29 Wim Taymans <wim.taymans@collabora.co.uk>
|
||||||
|
|
||||||
* ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_video_frame):
|
* ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_video_frame):
|
||||||
|
|
2
common
2
common
|
@ -1 +1 @@
|
||||||
Subproject commit 571dce3335f9be76978009b3842c050dbb900e6f
|
Subproject commit df7f73bd454e0b0ee7870d8c85874aba9329fd2e
|
|
@ -1160,7 +1160,7 @@ gst_ffmpegdemux_loop (GstPad * pad)
|
||||||
GstPad *srcpad;
|
GstPad *srcpad;
|
||||||
GstFFStream *stream;
|
GstFFStream *stream;
|
||||||
AVStream *avstream;
|
AVStream *avstream;
|
||||||
GstBuffer *outbuf;
|
GstBuffer *outbuf = NULL;
|
||||||
GstClockTime timestamp, duration;
|
GstClockTime timestamp, duration;
|
||||||
gint outsize;
|
gint outsize;
|
||||||
gboolean rawvideo;
|
gboolean rawvideo;
|
||||||
|
@ -1239,6 +1239,10 @@ gst_ffmpegdemux_loop (GstPad * pad)
|
||||||
if ((ret = gst_ffmpegdemux_aggregated_flow (demux)) != GST_FLOW_OK)
|
if ((ret = gst_ffmpegdemux_aggregated_flow (demux)) != GST_FLOW_OK)
|
||||||
goto no_buffer;
|
goto no_buffer;
|
||||||
|
|
||||||
|
/* If the buffer allocation failed, don't try sending it ! */
|
||||||
|
if (stream->last_flow != GST_FLOW_OK)
|
||||||
|
goto done;
|
||||||
|
|
||||||
/* copy the data from packet into the target buffer
|
/* copy the data from packet into the target buffer
|
||||||
* and do conversions for raw video packets */
|
* and do conversions for raw video packets */
|
||||||
if (rawvideo) {
|
if (rawvideo) {
|
||||||
|
|
Loading…
Reference in a new issue