2 Subject: Avoid format security warning and build breakage
5 lavtools/jpeg2yuv.c | 2 +-
6 lavtools/lav_io.c | 2 +-
7 lavtools/lavtrans.c | 4 ++--
9 yuvfilters/main.c | 4 ++--
10 yuvfilters/yuvkineco.c | 2 +-
11 6 files changed, 8 insertions(+), 8 deletions(-)
13 --- mjpegtools.orig/lavtools/lav_io.c
14 +++ mjpegtools/lavtools/lav_io.c
15 @@ -926,7 +926,7 @@ lav_file_t *lav_open_input_file(char *fi
16 strcat(errmsg, ", quicktime");
18 strcat(errmsg, ").\n");
19 - fprintf(stderr, errmsg);
20 + fprintf(stderr, "%s", errmsg);
22 internal_error = ERROR_FORMAT; /* Format not recognized */
24 --- mjpegtools.orig/lavtools/lavtrans.c
25 +++ mjpegtools/lavtools/lavtrans.c
26 @@ -275,7 +275,7 @@ int main(int argc, char ** argv)
27 if (process_image_frame != -1)
29 nv = el_get_video_frame(vbuff, process_image_frame, &el);
30 - sprintf(imgfname,outfile);
31 + sprintf(imgfname, "%s", outfile);
32 imgfd = fopen(imgfname,"wb");
33 if (imgfd==0) system_error("opening image file","fopen");
34 res = fwrite(vbuff,nv,1,imgfd);
35 @@ -307,7 +307,7 @@ int main(int argc, char ** argv)
39 - sprintf(imgfname,outfile,nframe);
40 + sprintf(imgfname,"%s%d",outfile,nframe);
41 imgfd = fopen(imgfname,"wb");
42 if (imgfd==0) system_error("opening image file","fopen");
43 res = fwrite(vbuff,nv,1,imgfd);
44 --- mjpegtools.orig/lavtools/jpeg2yuv.c
45 +++ mjpegtools/lavtools/jpeg2yuv.c
46 @@ -451,7 +451,7 @@ static int generate_YUV4MPEG(parameters_
50 - sprintf(jpegname, firstjpeg);
51 + sprintf(jpegname, "%s", firstjpeg);
55 --- mjpegtools.orig/mplex/main.cpp
56 +++ mjpegtools/mplex/main.cpp
57 @@ -614,7 +614,7 @@ bool CmdLineMultiplexJob::ParseWorkaroun
58 if( flag_table[flag].longname != 0 )
61 - mjpeg_error( message.c_str() );
62 + mjpeg_error( "%s", message.c_str() );
66 --- mjpegtools.orig/yuvfilters/yuvkineco.c
67 +++ mjpegtools/yuvfilters/yuvkineco.c
68 @@ -48,7 +48,7 @@ buf_debug(char *buf, FILE *fp, const cha
73 + mjpeg_debug("%s", buf);
77 --- mjpegtools.orig/yuvfilters/main.c
78 +++ mjpegtools/yuvfilters/main.c
79 @@ -53,7 +53,7 @@ usage(char **argv)
82 sprintf(buf, "Usage: %s %s", argv[0], (*MODULE.usage)());
84 + mjpeg_error("%s", buf);
88 @@ -91,7 +91,7 @@ main(int argc, char **argv)
89 if (ret == Y4M_ERR_EOF)
92 - WERRORL(y4m_strerr(ret));
93 + mjpeg_error("%s", y4m_strerr(ret));
96 for (h = hreader; h; h = hreader) {