Merge from 1.1.

Some fixups were required for the kfreebsd patch; needs testing.

--HG--
rename : src/video_out/libdha/ports.c => contrib/libdha/ports.c
rename : src/demuxers/demux_ogg.c => src/combined/xine_ogg_demuxer.c
rename : src/libxineadec/xine_vorbis_decoder.c => src/combined/xine_vorbis_decoder.c

1 files changed, 6 insertions, 2 deletions

diff --git a/src/xine-engine/xine.c b/src/xine-engine/xine.c
index 83137fb82..77430a053 100644
--- a/src/xine-engine/xine.c
+++ b/src/xine-engine/xine.c
@@ -35,7 +35,7 @@
 #include <pthread.h>
 #include <stdarg.h>
 #include <stdio.h>
-#if defined (__linux__)
+#if defined (__linux__) || defined (__GLIBC__)
 #include <endian.h>
 #elif defined (__FreeBSD__)
 #include <machine/endian.h>
@@ -1233,7 +1233,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;