Index: libmpdemux/demux_mov.c
===================================================================
--- libmpdemux/demux_mov.c	(Revision 23401)
+++ libmpdemux/demux_mov.c	(Arbeitskopie)
@@ -434,8 +434,10 @@
 		  case MOV_FOURCC('r','m','d','a'):
 		      continue;
 		  case MOV_FOURCC('r','d','r','f'): {
-		      int type=stream_read_dword_le(demuxer->stream);
-	              int slen=stream_read_dword(demuxer->stream);
+		      int type, slen/*, tmp*/;
+		      /*tmp=*/stream_read_dword(demuxer->stream);
+		      type=stream_read_dword_le(demuxer->stream);
+	              slen=stream_read_dword(demuxer->stream);
 		      //char* s=malloc(slen+1);
 		      //stream_read(demuxer->stream,s,slen);
 		      
@@ -454,7 +456,9 @@
 		      len-=12+slen;i-=12+slen; break;
 		    }
 		  case MOV_FOURCC('r','m','d','r'): {
-		      int rate=stream_read_dword(demuxer->stream);
+		      int rate/*, flags*/;
+		      /*flags=*/stream_read_dword(demuxer->stream);
+		      rate=stream_read_dword(demuxer->stream);
 		      mp_msg(MSGT_DEMUX,MSGL_V,"  min. data rate: %d bits/sec\n",rate);
 		      len-=8; i-=8; break;
 		    }
@@ -1636,11 +1640,17 @@
       break;
     }
     case MOV_FOURCC('h','d','l','r'): {
-      unsigned int type = stream_read_dword_le(demuxer->stream);
-      unsigned int subtype = stream_read_dword_le(demuxer->stream);
-      unsigned int manufact = stream_read_dword_le(demuxer->stream);
-      int len = stream_read_char(demuxer->stream);
-      char* str = malloc(len + 1);
+      unsigned int type, subtype, manufact/*, tmp, comp_flags, comp_mask*/;
+      int len;
+      char* str;
+      /*tmp = */stream_read_dword(demuxer->stream);
+      type = stream_read_dword_le(demuxer->stream);
+      subtype = stream_read_dword_le(demuxer->stream);
+      manufact = stream_read_dword_le(demuxer->stream);
+      /*comp_flags = */stream_read_dword(demuxer->stream);
+      /*comp_mask = */stream_read_dword(demuxer->stream);
+      len = stream_read_char(demuxer->stream);
+      str = malloc(len + 1);
       stream_read(demuxer->stream, str, len);
       str[len] = 0;
       mp_msg(MSGT_DEMUX, MSGL_V,
@@ -1718,9 +1728,10 @@
       break;
     }
     case MOV_FOURCC('s','t','t','s'): {
-      int len = stream_read_dword(demuxer->stream);
-      int i;
+      int len, i/*, temp*/;
       unsigned int pts = 0;
+      /*temp = */stream_read_dword(demuxer->stream);
+      len = stream_read_dword(demuxer->stream);
       mp_msg(MSGT_DEMUX, MSGL_V,
              "MOV: %*sSample duration table! (%d blocks)\n", level, "",
              len);
@@ -1776,8 +1787,9 @@
       break;
     }
     case MOV_FOURCC('s','t','c','o'): {
-      int len = stream_read_dword(demuxer->stream);
-      int i;
+      int len, i/*, temp*/;
+      /*temp = */stream_read_dword(demuxer->stream);
+      len = stream_read_dword(demuxer->stream);
       mp_msg(MSGT_DEMUX, MSGL_V, 
              "MOV: %*sChunk offset table! (%d chunks)\n", level, "",
              len);
@@ -1792,8 +1804,9 @@
       break;
     }
     case MOV_FOURCC('c','o','6','4'): {
-      int len = stream_read_dword(demuxer->stream);
-      int i;
+      int len, i/*, temp*/;
+      /*temp = */stream_read_dword(demuxer->stream);
+      len = stream_read_dword(demuxer->stream);
       mp_msg(MSGT_DEMUX, MSGL_V,
              "MOV: %*s64bit chunk offset table! (%d chunks)\n", level, "",
              len);