summaryrefslogtreecommitdiff
path: root/src/demuxers/demux_yuv_frames.c
diff options
context:
space:
mode:
authorDarren Salt <linux@youmustbejoking.demon.co.uk>2009-01-05 23:40:10 +0000
committerDarren Salt <linux@youmustbejoking.demon.co.uk>2009-01-05 23:40:10 +0000
commit85f173cd5b12d5a53a94a2616c498cdae68fec2a (patch)
tree655dbc4dcb7e2950bde6492c66e2572d53873c6e /src/demuxers/demux_yuv_frames.c
parent92d532f070f578c4f7f0df3daadf05497be1ed10 (diff)
parent5347abe5764b0a0ff3ef1d357ce9934a425758fa (diff)
downloadxine-lib-85f173cd5b12d5a53a94a2616c498cdae68fec2a.tar.gz
xine-lib-85f173cd5b12d5a53a94a2616c498cdae68fec2a.tar.bz2
Merge security fixes from 1.1.
--HG-- rename : src/demuxers/demux_nsf.c => src/combined/nsf_demuxer.c rename : src/demuxers/demux_ogg.c => src/combined/xine_ogg_demuxer.c rename : src/libsputext/demux_sputext.c => src/spu_dec/sputext_demuxer.c
Diffstat (limited to 'src/demuxers/demux_yuv_frames.c')
-rw-r--r--src/demuxers/demux_yuv_frames.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/demuxers/demux_yuv_frames.c b/src/demuxers/demux_yuv_frames.c
index 454541f06..0288c00fb 100644
--- a/src/demuxers/demux_yuv_frames.c
+++ b/src/demuxers/demux_yuv_frames.c
@@ -126,13 +126,19 @@ static void demux_yuv_frames_send_headers (demux_plugin_t *this_gen){
if(_x_stream_info_get(this->stream, XINE_STREAM_INFO_HAS_AUDIO)) {
buf = this->input->read_block(this->input, this->audio_fifo, 0);
- this->audio_fifo->put(this->audio_fifo, buf);
+ if (buf)
+ this->audio_fifo->put(this->audio_fifo, buf);
+ else
+ this->status = DEMUX_FINISHED;
}
if(_x_stream_info_get(this->stream, XINE_STREAM_INFO_HAS_VIDEO)) {
buf = this->input->read_block(this->input, this->video_fifo, 0);
- this->video_fifo->put(this->video_fifo, buf);
+ if (buf)
+ this->video_fifo->put(this->video_fifo, buf);
+ else
+ this->status = DEMUX_FINISHED;
}
this->status = DEMUX_OK;