diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-08-07 18:52:49 +0100 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-08-07 18:52:49 +0100 |
| commit | 8c24b5cd856fa47f605eba68ec0a49bd4d47d7da (patch) | |
| tree | d37ebbbf13ae879e481e72519a743bf21107933d | |
| parent | 8d62edd3e97c028aa15ed9504f182d7dc64b59d4 (diff) | |
| parent | 187ae21aaeee0c4c1a6aee2b9808b884af827437 (diff) | |
| download | xine-lib-8c24b5cd856fa47f605eba68ec0a49bd4d47d7da.tar.gz xine-lib-8c24b5cd856fa47f605eba68ec0a49bd4d47d7da.tar.bz2 | |
Merge.
| -rw-r--r-- | src/demuxers/demux_asf.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/demuxers/demux_asf.c b/src/demuxers/demux_asf.c index 3a0720043..9d4191633 100644 --- a/src/demuxers/demux_asf.c +++ b/src/demuxers/demux_asf.c @@ -444,13 +444,16 @@ static int asf_read_header (demux_asf_t *this) { asf_stream_t *asf_stream = this->asf_header->streams[i]; asf_demux_stream_t *demux_stream = &this->streams[i]; - if (!asf_stream && this->mode != ASF_MODE_NO_CONTENT) { + if (!asf_stream) { + if (this->mode != ASF_MODE_NO_CONTENT) { xine_log(this->stream->xine, XINE_LOG_MSG, - _("demux_asf: warning: The stream id=%d appears to be missing.\n"), asf_stream->stream_number); + _("demux_asf: warning: A stream appears to be missing.\n")); _x_message(this->stream, XINE_MSG_READ_ERROR, _("Media stream missing?"), NULL); this->mode = ASF_MODE_NO_CONTENT; } + return 0; + } if (asf_stream->encrypted_flag) { if (this->mode != ASF_MODE_ENCRYPTED_CONTENT) { |