5 files changed, 21 insertions, 15 deletions
diff --git a/src/demuxers/demux_asf.c b/src/demuxers/demux_asf.c
index 72e40b0c7..fc6af91df 100644
--- a/src/demuxers/demux_asf.c
+++ b/src/demuxers/demux_asf.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: demux_asf.c,v 1.69 2002/10/22 23:39:53 tmattern Exp $
+ * $Id: demux_asf.c,v 1.70 2002/10/23 20:26:32 guenter Exp $
  *
  * demultiplexer for asf streams
  *
@@ -1485,9 +1485,9 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen,
   return &this->demux_plugin;
 }
  
- static char *get_description (demux_class_t *this_gen) {
-   return "ASF demux plugin";
- }
+static char *get_description (demux_class_t *this_gen) {
+  return "ASF demux plugin";
+}
  
 static char *get_identifier (demux_class_t *this_gen) {
   return "ASF";
diff --git a/src/demuxers/demux_avi.c b/src/demuxers/demux_avi.c
index d507b3e1e..40cdabce5 100644
--- a/src/demuxers/demux_avi.c
+++ b/src/demuxers/demux_avi.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: demux_avi.c,v 1.126 2002/10/22 17:14:47 jkeil Exp $
+ * $Id: demux_avi.c,v 1.127 2002/10/23 20:26:32 guenter Exp $
  *
  * demultiplexer for avi streams
  *
@@ -64,10 +64,11 @@
 #include "xineutils.h"
 #include "demux.h"
 
-#define	WINE_TYPEDEFS_ONLY
-#include "libw32dll/wine/avifmt.h"
-#include "libw32dll/wine/windef.h"
-#include "libw32dll/wine/vfw.h"
+/*
+ * stolen from wine headers
+ */
+
+#define AVIIF_KEYFRAME      0x00000010L
 
 /*
 #define LOG
diff --git a/src/demuxers/demux_mpeg.c b/src/demuxers/demux_mpeg.c
index d2b24a278..d6cc4b031 100644
--- a/src/demuxers/demux_mpeg.c
+++ b/src/demuxers/demux_mpeg.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: demux_mpeg.c,v 1.83 2002/10/23 20:22:42 guenter Exp $
+ * $Id: demux_mpeg.c,v 1.84 2002/10/23 20:26:33 guenter Exp $
  *
  * demultiplexer for mpeg 1/2 program streams
  * reads streams of variable blocksizes
@@ -1145,7 +1145,6 @@ static int demux_mpeg_get_stream_length (demux_plugin_t *this_gen) {
 static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *stream,
 				    input_plugin_t *input) {
   demux_mpeg_t       *this;
-  config_values_t    *config = ((demux_mpeg_class_t *) class_gen)->config;
 
   this         = xine_xmalloc (sizeof (demux_mpeg_t));
   this->stream = stream;
diff --git a/src/demuxers/demux_qt.c b/src/demuxers/demux_qt.c
index 49de24215..8a8519659 100644
--- a/src/demuxers/demux_qt.c
+++ b/src/demuxers/demux_qt.c
@@ -30,7 +30,7 @@
  *    build_frame_table
  *  free_qt_info
  *
- * $Id: demux_qt.c,v 1.99 2002/10/23 10:48:17 jkeil Exp $
+ * $Id: demux_qt.c,v 1.100 2002/10/23 20:26:33 guenter Exp $
  *
  */
 
@@ -1658,13 +1658,17 @@ printf ("sending qt headers\n");
    */
   if( this->qt->video_type == BUF_VIDEO_MSMPEG4_V1 )
     this->qt->video_type = BUF_VIDEO_MPEG4;
+#if 0
   if( !this->qt->video_type && this->qt->video_codec )
     xine_report_codec( this->stream, XINE_CODEC_VIDEO, this->bih.biCompression, 0, 0);
+#endif
 
   this->qt->audio_type = formattag_to_buf_audio(this->qt->audio_codec);
 
+#if 0
   if( !this->qt->audio_type && this->qt->audio_codec )
     xine_report_codec( this->stream, XINE_CODEC_AUDIO, this->qt->audio_codec, 0, 0);
+#endif
 
   /* load stream information */
   this->stream->stream_info[XINE_STREAM_INFO_HAS_VIDEO] =
diff --git a/src/demuxers/qtpalette.h b/src/demuxers/qtpalette.h
index 9966e8eb8..18b47c697 100644
--- a/src/demuxers/qtpalette.h
+++ b/src/demuxers/qtpalette.h
@@ -1,6 +1,8 @@
-//  Default Palettes for Quicktime Files
-//  Automatically generated from a utility derived from XAnim:
-//    http://xanim.va.pubnix.com/home.html
+/*
+ * Default Palettes for Quicktime Files
+ *  Automatically generated from a utility derived from XAnim:
+ *  http://xanim.va.pubnix.com/home.html
+ */
 
 #ifndef QTPALETTE_H
 #define QTPALETTE_H