Originally committed as revision 9712 to svn://svn.ffmpeg.org/ffmpeg/trunk
| ... | ... |
@@ -102,10 +102,10 @@ version.h: |
| 102 | 102 |
output_example$(EXESUF): output_example.o .libs |
| 103 | 103 |
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(EXTRALIBS) |
| 104 | 104 |
|
| 105 |
-tools/qt-faststart$(EXESUF): qt-faststart.c |
|
| 105 |
+tools/qt-faststart$(EXESUF): tools/qt-faststart.c |
|
| 106 | 106 |
$(CC) $(CFLAGS) $< -o $@ |
| 107 | 107 |
|
| 108 |
-tools/cws2fws$(EXESUF): cws2fws.c |
|
| 108 |
+tools/cws2fws$(EXESUF): tools/cws2fws.c |
|
| 109 | 109 |
$(CC) $(CFLAGS) $< -o $@ -lz |
| 110 | 110 |
|
| 111 | 111 |
ffplay.o: CFLAGS += $(SDL_CFLAGS) |
| ... | ... |
@@ -16,7 +16,7 @@ |
| 16 | 16 |
#ifdef DEBUG |
| 17 | 17 |
#define dbgprintf printf |
| 18 | 18 |
#else |
| 19 |
-#define dbgprintf |
|
| 19 |
+#define dbgprintf(...) |
|
| 20 | 20 |
#endif |
| 21 | 21 |
|
| 22 | 22 |
int main(int argc, char *argv[]) |
| ... | ... |
@@ -111,13 +111,13 @@ int main(int argc, char *argv[]) |
| 111 | 111 |
|
| 112 | 112 |
if (zstream.total_out != uncomp_len-8) |
| 113 | 113 |
{
|
| 114 |
- printf("Size mismatch (%d != %d), updating header...\n",
|
|
| 114 |
+ printf("Size mismatch (%lu != %d), updating header...\n",
|
|
| 115 | 115 |
zstream.total_out, uncomp_len-8); |
| 116 | 116 |
|
| 117 | 117 |
buf_in[0] = (zstream.total_out+8) & 0xff; |
| 118 |
- buf_in[1] = (zstream.total_out+8 >> 8) & 0xff; |
|
| 119 |
- buf_in[2] = (zstream.total_out+8 >> 16) & 0xff; |
|
| 120 |
- buf_in[3] = (zstream.total_out+8 >> 24) & 0xff; |
|
| 118 |
+ buf_in[1] = ((zstream.total_out+8) >> 8) & 0xff; |
|
| 119 |
+ buf_in[2] = ((zstream.total_out+8) >> 16) & 0xff; |
|
| 120 |
+ buf_in[3] = ((zstream.total_out+8) >> 24) & 0xff; |
|
| 121 | 121 |
|
| 122 | 122 |
lseek(fd_out, 4, SEEK_SET); |
| 123 | 123 |
write(fd_out, &buf_in, 4); |