[patch] scanf-fixes (for e.g. 64bit) for avidemux-2.3_preview2

avidemux-2.3_pre2-scanf.patch (text/plain), 5.71 KB, created by Martin Väth on 2006-11-18 13:56:50 UTC

--- avidemux/ADM_encoder/adm_encConfig.cpp
+++ avidemux/ADM_encoder/adm_encConfig.cpp
@@ -772,7 +772,7 @@
 //***
 
   fgets (str, 200, fd);		// here we got the conf
-  fscanf (fd, "Video extraConf size : %lu\n", &extraSize);
+  unsigned long d; fscanf (fd, "Video extraConf size : %lu\n", &d); extraSize = d;
   if (extraSize)
     {
       uint8_t *ptr;
--- avidemux/ADM_mpegdemuxer/dmx_audio.cpp
+++ avidemux/ADM_mpegdemuxer/dmx_audio.cpp
@@ -79,11 +79,11 @@
   FILE *file;
   uint32_t dummy;		//,audio=0;
   char string[MAX_LINE];	//,str[1024];;
-  uint32_t w = 720, h = 576, fps = 0;
-  uint8_t type, progressif;
+  int w = 720, h = 576, fps = 0;
+  char type, progressif;
   char realname[1024];
-  uint32_t aPid, vPid, aPes,mainAudio;
-  uint32_t nbGop, nbFrame,nbAudioStream;
+  int aPid, vPid, aPes,mainAudio;
+  int nbGop, nbFrame,nbAudioStream;
   int multi;
 
  file=fopen(name,"rt");
@@ -205,8 +205,9 @@
  
   printf ("Building index with %u sync points\n", nbGop);
 
-  uint32_t read = 0, img, count;
-  uint64_t abs;
+  uint32_t read = 0;
+  int img, abs;
+  long count;
 
   
   while (read < nbGop)
--- avidemux/ADM_mpegdemuxer/dmx_video.cpp
+++ avidemux/ADM_mpegdemuxer/dmx_video.cpp
@@ -185,11 +185,11 @@
 {
                 FILE *file;
         
-                uint32_t w=720,h=576,fps=0;
-                uint8_t  type,progressif;
+                int      w=720,h=576,fps=0;
+                int      type,progressif;
                 char     realname[1024];
                 uint32_t dummy;
-                uint32_t vPid,vTsId;
+                int      vPid,vTsId;
                 
                 char string[MAX_LINE+1]; //,str[1024];;
                 uint8_t interlac=0;
@@ -242,10 +242,12 @@
                 sscanf(string,"Picture  : %u x %u %u fps\n",&w,&h,&fps); // width...
 
                 fgets(string,MAX_LINE,file);
-                sscanf(string,"Nb Gop   : %u \n",&_nbGop); // width...
+                { unsigned int i;
+                sscanf(string,"Nb Gop   : %u \n",&i); _nbGop=i;}// width...
 
                 fgets(string,MAX_LINE,file);
-                sscanf(string,"Nb Images: %u \n",&_nbFrames); // width...
+                { unsigned int i;
+                sscanf(string,"Nb Images: %u \n",&i); _nbFrames=i;}// width...
 
                 fgets(string,MAX_LINE,file);
                 //fscanf(string,"Nb Audio : %u\n",0); 
@@ -317,11 +319,11 @@
                 // -------------- Read the file (video)---------------------
                 uint32_t read=0;
                 uint32_t currentImage=0;
-                uint32_t gop,imageStart,imageNb;
+                int      gop,imageStart,imageNb;
                 uint64_t abs,rel;
-                uint8_t  imgtype;
-                uint32_t imgsize;
-                uint64_t imgrel,imgabs;
+                char     imgtype;
+                int      imgsize;
+                long long imgrel,imgabs;
                 char *str,*needle;
                 
                 DIA_working *work=new DIA_working("Opening mpeg..");
--- avidemux/ADM_ogm/ADM_ogm.cpp
+++ avidemux/ADM_ogm/ADM_ogm.cpp
@@ -264,7 +264,7 @@
 			if(!strcmp(str,"audio"))
 			{
                                 memcpy(&header,buffer,sizeof(header));
-				uint32_t codec;
+				unsigned int codec;
 				OINFO(subtype,4);
 				sscanf(str,"%x",&codec);
 				printf("Audio fourcc:%d (%x)\n",codec,codec);
--- avidemux/ADM_toolkit/automation.cpp
+++ avidemux/ADM_toolkit/automation.cpp
@@ -323,7 +323,7 @@
 
 void call_normalize   (char *p)
 {
-  int32_t i;
+  int i;
   sscanf(p,"%d",&i);
         audioFilterNormalizeMode(i);	
 }
--- avidemux/ADM_video/ADM_vidMPdelogo.cpp
+++ avidemux/ADM_video/ADM_vidMPdelogo.cpp
@@ -342,10 +342,12 @@
 	memset(vf->priv, 0, sizeof(struct vf_priv_s));
     }
 
-    if (args) res = sscanf(args, "%d:%d:%d:%d:%d",
-			   &vf->priv->xoff, &vf->priv->yoff,
-			   &vf->priv->lw, &vf->priv->lh,
-			   &vf->priv->band);
+    if (args)
+    { int a,b,c,d,e;
+    res = sscanf(args, "%d:%d:%d:%d:%d",a,b,c,d,e);
+			   vf->priv->xoff=a; vf->priv->yoff=b;
+			   vf->priv->lw=c; &vf->priv->lh=d;
+			   vf->priv->band=e;
     if (args && (res != 5)) {
 	uninit(vf);
 	return 0; // bad syntax
--- avidemux/ADM_video/ADM_vobsubinfo.cpp
+++ avidemux/ADM_video/ADM_vobsubinfo.cpp
@@ -45,11 +45,11 @@
 {
 int hh,mm,ss,ms,o;
 uint64_t ti;
-uint32_t pos;
+unsigned long long pos;
 
         ADM_assert(line<sub->nbLines);
 
-        o=sscanf(str,"timestamp: %d:%d:%d:%d, filepos: %x\n",&hh,&mm,&ss,&ms,&pos);
+        o=sscanf(str,"timestamp: %d:%d:%d:%d, filepos: %llx\n",&hh,&mm,&ss,&ms,&pos);
         ADM_assert(o==5);
         
         ti=hh*3600+mm*60+ss;
--- avidemux/mpeg2enc/mpeg2setup.cc
+++ avidemux/mpeg2enc/mpeg2setup.cc
@@ -1366,9 +1366,10 @@
             /* Empty lines (\n only) and comments are ignored */
             if  ((strlen(line) == 1) || line[0] == '#')
                 continue;
+            unsigned int qscan[8];
             j = sscanf(line, "%hu,%hu,%hu,%hu,%hu,%hu,%hu,%hu\n",
-                    &q[i+0], &q[i+1], &q[i+2], &q[i+3],
-		    &q[i+4], &q[i+5], &q[i+6], &q[i+7]);
+                    &qscan[0], &qscan[1], &qscan[2], &qscan[3],
+		    &qscan[4], &qscan[5], &qscan[6], &qscan[7]);
             if  (j != 8)
                 {
                 mjpeg_error("line %d ('%s') of '%s' malformed", row, line, fname);
@@ -1376,10 +1377,11 @@
                 }
             for (j = 0; j < 8; j++)
                 {
+                q[i + j] = (uint16_t)qscan[j];
                 if  (q[i + j] < 1 || q[i + j] > 255)
                     {
                     mjpeg_error("entry %d (%u) in line %d from '%s' invalid",
-                        j, q[i + j], row, fname);
+                        j, qscan[i], row, fname);
                     i = -1;
                     break;
                     }