summaryrefslogtreecommitdiff
path: root/src/demuxers
diff options
context:
space:
mode:
authorDarren Salt <linux@youmustbejoking.demon.co.uk>2009-03-16 15:05:19 +0000
committerDarren Salt <linux@youmustbejoking.demon.co.uk>2009-03-16 15:05:19 +0000
commitf62eed3209aab6fc642e66b18cc71d526517aadb (patch)
tree4b56b352759d4de7196a6ce564cf2ff88dfd08b2 /src/demuxers
parentd8a50c1e20367be95911533c62637c23b809b916 (diff)
parentc3580b925a6c33105ee483d3c616a16f8ce0bba9 (diff)
downloadxine-lib-f62eed3209aab6fc642e66b18cc71d526517aadb.tar.gz
xine-lib-f62eed3209aab6fc642e66b18cc71d526517aadb.tar.bz2
Merge from 1.1.
--HG-- rename : src/libmpeg2new/Makefile.am => src/video_dec/libmpeg2new/Makefile.am rename : src/libmpeg2new/libmpeg2/Makefile.am => src/video_dec/libmpeg2new/libmpeg2/Makefile.am
Diffstat (limited to 'src/demuxers')
-rw-r--r--src/demuxers/demux_mpeg_block.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/demuxers/demux_mpeg_block.c b/src/demuxers/demux_mpeg_block.c
index db98a34cc..d910894d6 100644
--- a/src/demuxers/demux_mpeg_block.c
+++ b/src/demuxers/demux_mpeg_block.c
@@ -1422,7 +1422,8 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
}
input->seek(input, 0, SEEK_SET);
- if (input->read(input, this->scratch, this->blocksize) == this->blocksize) {
+ memset (this->scratch, 255, 5); /* result of input->read() won't matter */
+ if (input->read(input, this->scratch, this->blocksize)) {
lprintf("open_plugin:read worked\n");
if (this->scratch[0] || this->scratch[1]