diff -p -up mjpegtools-1.9.0/config.h.in~ mjpegtools-1.9.0/config.h.in --- mjpegtools-1.9.0/config.h.in~ 2009-01-06 07:49:28.000000000 +0100 +++ mjpegtools-1.9.0/config.h.in 2009-01-06 12:36:05.000000000 +0100 @@ -1,5 +1,8 @@ /* config.h.in. Generated from configure.ac by autoheader. */ +/* Define if building universal (internal helper macro) */ +#undef AC_APPLE_UNIVERSAL_BUILD + /* Inline PPC Altivec primitives available */ #undef HAVE_ALTIVEC @@ -136,12 +139,42 @@ /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS +/* Enable extensions on AIX 3, Interix. */ +#ifndef _ALL_SOURCE +# undef _ALL_SOURCE +#endif +/* Enable GNU extensions on systems that have them. */ +#ifndef _GNU_SOURCE +# undef _GNU_SOURCE +#endif +/* Enable threading extensions on Solaris. */ +#ifndef _POSIX_PTHREAD_SEMANTICS +# undef _POSIX_PTHREAD_SEMANTICS +#endif +/* Enable extensions on HP NonStop. */ +#ifndef _TANDEM_SOURCE +# undef _TANDEM_SOURCE +#endif +/* Enable general extensions on Solaris. */ +#ifndef __EXTENSIONS__ +# undef __EXTENSIONS__ +#endif + + /* Version number of package */ #undef VERSION -/* Define to 1 if your processor stores words with the most significant byte - first (like Motorola and SPARC, unlike Intel and VAX). */ -#undef WORDS_BIGENDIAN +/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most + significant byte first (like Motorola and SPARC, unlike Intel). */ +#if defined AC_APPLE_UNIVERSAL_BUILD +# if defined __BIG_ENDIAN__ +# define WORDS_BIGENDIAN 1 +# endif +#else +# ifndef WORDS_BIGENDIAN +# undef WORDS_BIGENDIAN +# endif +#endif /* Define to 1 if the X Window System is missing or not being used. */ #undef X_DISPLAY_MISSING @@ -149,14 +182,19 @@ /* Number of bits in a file offset, on hosts where this is settable. */ #undef _FILE_OFFSET_BITS -/* Enable GNU extensions on systems that have them. */ -#ifndef _GNU_SOURCE -# undef _GNU_SOURCE -#endif - /* Define for large files, on AIX-style hosts. */ #undef _LARGE_FILES +/* Define to 1 if on MINIX. */ +#undef _MINIX + +/* Define to 2 if the system does not provide POSIX.1 features except with + this defined. */ +#undef _POSIX_1_SOURCE + +/* Define to 1 if you need to in order for `stat' and other things to work. */ +#undef _POSIX_SOURCE + /* Define to empty if `const' does not conform to ANSI C. */ #undef const diff -p -up mjpegtools-1.9.0/lavtools/jpeg2yuv.c~ mjpegtools-1.9.0/lavtools/jpeg2yuv.c --- mjpegtools-1.9.0/lavtools/jpeg2yuv.c~ 2008-01-06 08:12:09.000000000 +0100 +++ mjpegtools-1.9.0/lavtools/jpeg2yuv.c 2009-01-06 12:45:36.000000000 +0100 @@ -451,7 +451,7 @@ static int generate_YUV4MPEG(parameters_ if (firstjpeg) { p = firstjpeg; - sprintf(jpegname, firstjpeg); + sprintf(jpegname, "%s", firstjpeg); firstjpeg = NULL; } else { diff -p -up mjpegtools-1.9.0/lavtools/lav_io.c~ mjpegtools-1.9.0/lavtools/lav_io.c --- mjpegtools-1.9.0/lavtools/lav_io.c~ 2007-10-07 09:01:22.000000000 +0200 +++ mjpegtools-1.9.0/lavtools/lav_io.c 2009-01-06 12:43:45.000000000 +0100 @@ -926,7 +926,7 @@ lav_file_t *lav_open_input_file(char *fi strcat(errmsg, ", quicktime"); #endif strcat(errmsg, ").\n"); - fprintf(stderr, errmsg); + fprintf(stderr, "%s", errmsg); free(lav_fd); internal_error = ERROR_FORMAT; /* Format not recognized */ return 0; diff -p -up mjpegtools-1.9.0/lavtools/lavtrans.c~ mjpegtools-1.9.0/lavtools/lavtrans.c --- mjpegtools-1.9.0/lavtools/lavtrans.c~ 2005-10-02 19:01:30.000000000 +0200 +++ mjpegtools-1.9.0/lavtools/lavtrans.c 2009-01-06 12:45:02.000000000 +0100 @@ -275,7 +275,7 @@ int main(int argc, char ** argv) if (process_image_frame != -1) { nv = el_get_video_frame(vbuff, process_image_frame, &el); - sprintf(imgfname,outfile); + sprintf(imgfname,"%s", outfile); imgfd = fopen(imgfname,"wb"); if (imgfd==0) system_error("opening image file","fopen"); res = fwrite(vbuff,nv,1,imgfd); diff -p -up mjpegtools-1.9.0/mpeg2enc/encoderparams.cc~ mjpegtools-1.9.0/mpeg2enc/encoderparams.cc --- mjpegtools-1.9.0/mpeg2enc/encoderparams.cc~ 2007-11-01 19:44:10.000000000 +0100 +++ mjpegtools-1.9.0/mpeg2enc/encoderparams.cc 2009-01-06 12:41:16.000000000 +0100 @@ -784,7 +784,7 @@ void EncoderParams::InitQuantMatrices( c } if (msg) - mjpeg_info(msg); + mjpeg_info("%$", msg); for (i = 0; i < 64; i++) { diff -p -up mjpegtools-1.9.0/mpeg2enc/mpeg2enc.cc~ mjpegtools-1.9.0/mpeg2enc/mpeg2enc.cc --- mjpegtools-1.9.0/mpeg2enc/mpeg2enc.cc~ 2008-01-30 17:04:32.000000000 +0100 +++ mjpegtools-1.9.0/mpeg2enc/mpeg2enc.cc 2009-01-06 12:42:56.000000000 +0100 @@ -110,7 +110,7 @@ public: outfile ); if( written != static_cast<size_t>(flush_upto) ) { - mjpeg_error_exit1( strerror(ferror(outfile)) ); + mjpeg_error_exit1( "%s", strerror(ferror(outfile)) ); } flushed += flush_upto; } diff -p -up mjpegtools-1.9.0/mplex/main.cpp~ mjpegtools-1.9.0/mplex/main.cpp --- mjpegtools-1.9.0/mplex/main.cpp~ 2008-08-31 17:08:36.000000000 +0200 +++ mjpegtools-1.9.0/mplex/main.cpp 2009-01-06 12:47:05.000000000 +0100 @@ -565,7 +565,7 @@ bool CmdLineMultiplexJob::ParseWorkaroun message += sep; } while( flag_table[flag].longname != 0 ); - mjpeg_error( message.c_str() ); + mjpeg_error( "%s", message.c_str() ); return false; } diff -p -up mjpegtools-1.9.0/yuvfilters/yuvfilters.h~ mjpegtools-1.9.0/yuvfilters/yuvfilters.h --- mjpegtools-1.9.0/yuvfilters/yuvfilters.h~ 2005-02-27 23:46:56.000000000 +0100 +++ mjpegtools-1.9.0/yuvfilters/yuvfilters.h 2009-01-06 12:50:30.000000000 +0100 @@ -35,7 +35,7 @@ extern "C" { #ifdef MJPEGTOOLS # define perror(MSG) mjpeg_error("%s: %s", MSG, strerror(errno)) # define WERROR(MSG) mjpeg_error(MSG) -# define WERRORL(MSG) mjpeg_error(MSG) +# define WERRORL(MSG) mjpeg_error("%s", MSG) # define WWARN(MSG) mjpeg_warn(MSG) #else # define WERROR(MSG) write(2, MSG "\n", sizeof MSG) diff -p -up mjpegtools-1.9.0/yuvfilters/yuvkineco.c~ mjpegtools-1.9.0/yuvfilters/yuvkineco.c --- mjpegtools-1.9.0/yuvfilters/yuvkineco.c~ 2005-12-05 06:06:06.000000000 +0100 +++ mjpegtools-1.9.0/yuvfilters/yuvkineco.c 2009-01-06 12:48:11.000000000 +0100 @@ -48,7 +48,7 @@ buf_debug(char *buf, FILE *fp, const cha } else { #ifdef MJPEGTOOLS buf[n] = '\0'; - mjpeg_debug(buf); + mjpeg_debug("%s", buf); #else fputs(buf, stderr); #endif