fix tools compilation

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@9712 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

diff --git a/Makefile b/Makefile
index a057ecf9e5e8a65bb2bf83488dfa3eab5e988036..16ba165db61a1ca085f069fd654fb1eda655fd37 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -102,10 +102,10 @@ version.h:
 output_example$(EXESUF): output_example.o .libs
        $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(EXTRALIBS)
 
-tools/qt-faststart$(EXESUF): qt-faststart.c
+tools/qt-faststart$(EXESUF): tools/qt-faststart.c
        $(CC) $(CFLAGS) $< -o $@
 
-tools/cws2fws$(EXESUF): cws2fws.c
+tools/cws2fws$(EXESUF): tools/cws2fws.c
        $(CC) $(CFLAGS) $< -o $@ -lz
 
 ffplay.o: CFLAGS += $(SDL_CFLAGS)

diff --git a/tools/cws2fws.c b/tools/cws2fws.c
index f81e2e26eae1296bcb15b10d3339ba9df1e075f7..0eae4b06de09ec6a26677fe97fb899d812deabc3 100644 (file)
--- a/tools/cws2fws.c
+++ b/tools/cws2fws.c
@@ -16,7 +16,7 @@
 #ifdef DEBUG
 #define dbgprintf printf
 #else
-#define dbgprintf
+#define dbgprintf(...)
 #endif
 
 int main(int argc, char *argv[])
@@ -111,13 +111,13 @@ int main(int argc, char *argv[])
 
     if (zstream.total_out != uncomp_len-8)
     {
-        printf("Size mismatch (%d != %d), updating header...\n",
+        printf("Size mismatch (%lu != %d), updating header...\n",
             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);