aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenoit Fouet <benoit.fouet@free.fr>2007-07-17 08:28:48 +0000
committerBenoit Fouet <benoit.fouet@free.fr>2007-07-17 08:28:48 +0000
commit83ef1fea6517e3b69c5ccbc2bfaf9f460203d36f (patch)
tree81af39bbe57e40c75f740ba5d68e84ab0db42b3e
parent975741e79cedc6033e5b02319792534a3a42c4ae (diff)
downloadffmpeg-83ef1fea6517e3b69c5ccbc2bfaf9f460203d36f.tar.gz
fix tools compilation
Originally committed as revision 9712 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--Makefile4
-rw-r--r--tools/cws2fws.c10
2 files changed, 7 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index a057ecf9e5..16ba165db6 100644
--- 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 f81e2e26ea..0eae4b06de 100644
--- 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);