diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2007-11-23 19:32:35 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2007-11-23 19:32:35 +0000 |
| commit | 740cb399dcf72420ac0c8a6048dca8fac09daf3d (patch) | |
| tree | 92b18c4be7212b84b99ecb94e1d81be8027a03f8 /src/xine-engine/xine.c | |
| parent | ff8930972b4242d31e540a38f1d8053e846d68e6 (diff) | |
| parent | c1f730ab426636b5fea1dc657d2278950ace5de6 (diff) | |
| download | xine-lib-740cb399dcf72420ac0c8a6048dca8fac09daf3d.tar.gz xine-lib-740cb399dcf72420ac0c8a6048dca8fac09daf3d.tar.bz2 | |
Merge.
Diffstat (limited to 'src/xine-engine/xine.c')
| -rw-r--r-- | src/xine-engine/xine.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/xine-engine/xine.c b/src/xine-engine/xine.c index 41eeff02c..097ce99ef 100644 --- a/src/xine-engine/xine.c +++ b/src/xine-engine/xine.c @@ -1193,7 +1193,11 @@ static int open_internal (xine_stream_t *stream, const char *mrl) { stream->demux_plugin->send_headers (stream->demux_plugin); if (stream->demux_plugin->get_status(stream->demux_plugin) != DEMUX_OK) { - xine_log (stream->xine, XINE_LOG_MSG, _("xine: demuxer failed to start\n")); + if (stream->demux_plugin->get_status(stream->demux_plugin) == DEMUX_FINISHED) { + xine_log (stream->xine, XINE_LOG_MSG, _("xine: demuxer is already done. that was fast!\n")); + } else { + xine_log (stream->xine, XINE_LOG_MSG, _("xine: demuxer failed to start\n")); + } _x_free_demux_plugin(stream, stream->demux_plugin); stream->demux_plugin = NULL; |