revert my accidental previous commit
authorBenoit Fouet <benoit.fouet@free.fr>
Tue, 17 Jul 2007 08:29:59 +0000 (08:29 +0000)
committerBenoit Fouet <benoit.fouet@free.fr>
Tue, 17 Jul 2007 08:29:59 +0000 (08:29 +0000)
Originally committed as revision 9713 to svn://svn.ffmpeg.org/ffmpeg/trunk

tools/cws2fws.c

index 0eae4b0..f81e2e2 100644 (file)
@@ -16,7 +16,7 @@
 #ifdef DEBUG
 #define dbgprintf printf
 #else
 #ifdef DEBUG
 #define dbgprintf printf
 #else
-#define dbgprintf(...)
+#define dbgprintf
 #endif
 
 int main(int argc, char *argv[])
 #endif
 
 int main(int argc, char *argv[])
@@ -111,13 +111,13 @@ int main(int argc, char *argv[])
 
     if (zstream.total_out != uncomp_len-8)
     {
 
     if (zstream.total_out != uncomp_len-8)
     {
-        printf("Size mismatch (%lu != %d), updating header...\n",
+        printf("Size mismatch (%d != %d), updating header...\n",
             zstream.total_out, uncomp_len-8);
 
         buf_in[0] = (zstream.total_out+8) & 0xff;
             zstream.total_out, uncomp_len-8);
 
         buf_in[0] = (zstream.total_out+8) & 0xff;
-        buf_in[1] = ((zstream.total_out+8) >> 8) & 0xff;
-        buf_in[2] = ((zstream.total_out+8) >> 16) & 0xff;
-        buf_in[3] = ((zstream.total_out+8) >> 24) & 0xff;
+        buf_in[1] = (zstream.total_out+8 >> 8) & 0xff;
+        buf_in[2] = (zstream.total_out+8 >> 16) & 0xff;
+        buf_in[3] = (zstream.total_out+8 >> 24) & 0xff;
 
         lseek(fd_out, 4, SEEK_SET);
         write(fd_out, &buf_in, 4);
 
         lseek(fd_out, 4, SEEK_SET);
         write(fd_out, &buf_in, 4);