diff --git a/gst/avi/README b/gst/avi/README
index 7ccd620604..f1b5441b60 100644
--- a/gst/avi/README
+++ b/gst/avi/README
@@ -16,10 +16,10 @@ raw audio and video.
   ! avidecoder                         !
   !                                 (video/raw)...
   !     (----------)                   !
-  !     ! demuxer (video/avi, auds)..  !
+  !     ! demuxer (video/x-msvideo, auds)..
   !     !          !                   !
   !   -src         !                   !
-  !  /  !         (video/avi, vids)..  !
+  !  /  !         (video/x-msvideo, vids)..
  - src  !          !                   !
   !     (----------)                (audio/raw)...
   !                                    !
@@ -52,10 +52,10 @@ example:
   ! avidecoder               (--------)    (------)                !
   !                          !avitypes!    !windec!       /-- (video/raw)
   !     (----------)     /-sink      src--sink   src -----         !
-  !     !demuxer (video/avi, !        !    !      !                !
+  !     !demuxer (video/x-msvideo,    !    !      !                !
   !     !          ! auds).. (--------)    (------)                !  
   !   -sink        !         (--------)                            !
-  !  /  !        (video/avi, !avitypes!                            !
+  !  /  !        (video/x-..,!avitypes!                            !
  -sink  !          ! vids).. !        !                            !
   !     (----------)     \-sink      src -------------------- (audio/raw)
   !                          (--------)                            !
diff --git a/gst/avi/gstavidemux.c b/gst/avi/gstavidemux.c
index 56fd5ad531..a1f526d888 100644
--- a/gst/avi/gstavidemux.c
+++ b/gst/avi/gstavidemux.c
@@ -50,7 +50,7 @@ GST_PAD_TEMPLATE_FACTORY (sink_templ,
   GST_PAD_ALWAYS,
   GST_CAPS_NEW (
     "avidemux_sink",
-    "video/avi",
+    "video/x-msvideo",
       NULL
   )
 );
diff --git a/gst/avi/gstavimux.c b/gst/avi/gstavimux.c
index 5caa4a77e7..451871fa9a 100644
--- a/gst/avi/gstavimux.c
+++ b/gst/avi/gstavimux.c
@@ -60,7 +60,7 @@ GST_PAD_TEMPLATE_FACTORY (src_factory,
   GST_PAD_ALWAYS,
   GST_CAPS_NEW (
     "avimux_src_video",
-    "video/avi",
+    "video/x-msvideo",
     NULL
   )
 )
diff --git a/gst/qtdemux/qtdemux.c b/gst/qtdemux/qtdemux.c
index 9dfeca9747..9f8a8b0675 100644
--- a/gst/qtdemux/qtdemux.c
+++ b/gst/qtdemux/qtdemux.c
@@ -378,7 +378,7 @@ static void gst_qtdemux_loop_header (GstElement *element)
 	}while(1);
 
         qtdemux_parse_moov(qtdemux, GST_BUFFER_DATA(moov), length);
-        if(0)qtdemux_node_dump(qtdemux, qtdemux->moov_node);
+        if(1)qtdemux_node_dump(qtdemux, qtdemux->moov_node);
         qtdemux_parse_tree(qtdemux);
         qtdemux->state = QTDEMUX_STATE_MOVIE;
         break;