[FFmpeg-cvslog] r9712 - in trunk: Makefile tools/cws2fws.c

[Benoit Fouet]

benoit wrote:
> Modified: trunk/Makefile
> ==============================================================================
> --- trunk/Makefile	(original)
> +++ trunk/Makefile	Tue Jul 17 10:28:48 2007
> @@ -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)
>   

i hope i didn't misunderstand M?ns on what is trivial and what is not...

> Modified: trunk/tools/cws2fws.c
> ==============================================================================
> --- trunk/tools/cws2fws.c	(original)
> +++ trunk/tools/cws2fws.c	Tue Jul 17 10:28:48 2007
> @@ -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);
>   

i'm sorry about that one, i reverted it and will send a patch before...

-- 
Ben
Purple Labs S.A.
www.purplelabs.com