diff --git a/demux_mov.c b/demux_mov.c
index 39a6e9954b..3c5e0282cf 100644
--- a/demux_mov.c
+++ b/demux_mov.c
@@ -440,12 +440,12 @@ int mov_read_header(demuxer_t* demuxer){
     if(!stream_seek(demuxer->stream,priv->moov_start)) return 0; // ???
     lschunks(demuxer, 0, priv->moov_end, NULL);
 
-    // Build tables:
-    // ...
-    
-    mp_msg(MSGT_DEMUX,MSGL_ERR,MSGTR_MOVnotyetsupp);
-
+#if 1    
     return 1;
+#else
+    mp_msg(MSGT_DEMUX,MSGL_ERR,MSGTR_MOVnotyetsupp);
+    return 0;
+#endif
 }
 
 // return value:
diff --git a/demuxer.c b/demuxer.c
index 074c9fca96..276ac454af 100644
--- a/demuxer.c
+++ b/demuxer.c
@@ -455,9 +455,9 @@ demuxer->file_format=file_format;
 
 switch(file_format){
  case DEMUXER_TYPE_MOV: {
-  mov_read_header(demuxer);
-  sh_video=d_video->sh;if(sh_video) sh_video->ds=d_video;
-  sh_audio=d_audio->sh;if(sh_audio) sh_audio->ds=d_audio;
+  if(!mov_read_header(demuxer)) return NULL;
+//  sh_video=d_video->sh;if(sh_video) sh_video->ds=d_video;
+//  sh_audio=d_audio->sh;if(sh_audio) sh_audio->ds=d_audio;
   break;
  }
  case DEMUXER_TYPE_AVI: {