Attachment #102303 for bug #104753




++ avidemux/ADM_encoder/adm_encConfig.cpp

//***

  fgets (str, 200, fd);		// here we got the conf
  unsigned long d; fscanf (fd, "Video extraConf size : %lu\n", &d); extraSize = d;
  if (extraSize)
    {
      uint8_t *ptr;
++ avidemux/ADM_mpegdemuxer/dmx_audio.cpp

  FILE *file;
  uint32_t dummy;		//,audio=0;
  char string[MAX_LINE];	//,str[1024];;
  int w = 720, h = 576, fps = 0;
  char type, progressif;
  char realname[1024];
  int aPid, vPid, aPes,mainAudio;
  int nbGop, nbFrame,nbAudioStream;
  int multi;

 file=fopen(name,"rt");

 
  printf ("Building index with %u sync points\n", nbGop);

  uint32_t read = 0;
  int img, abs;
  long count;

  
  while (read < nbGop)
++ avidemux/ADM_mpegdemuxer/dmx_video.cpp

{
                FILE *file;
        
                int      w=720,h=576,fps=0;
                int      type,progressif;
                char     realname[1024];
                uint32_t dummy;
                int      vPid,vTsId;
                
                char string[MAX_LINE+1]; //,str[1024];;
                uint8_t interlac=0;

                sscanf(string,"Picture  : %u x %u %u fps\n",&w,&h,&fps); // width...

                fgets(string,MAX_LINE,file);
                { unsigned int i;
                sscanf(string,"Nb Gop   : %u \n",&i); _nbGop=i;}// width...

                fgets(string,MAX_LINE,file);
                { 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); 

                // -------------- Read the file (video)---------------------
                uint32_t read=0;
                uint32_t currentImage=0;
                int      gop,imageStart,imageNb;
                uint64_t abs,rel;
                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

			if(!strcmp(str,"audio"))
			{
                                memcpy(&header,buffer,sizeof(header));
				unsigned int codec;
				OINFO(subtype,4);
				sscanf(str,"%x",&codec);
				printf("Audio fourcc:%d (%x)\n",codec,codec);
++ avidemux/ADM_toolkit/automation.cpp


void call_normalize   (char *p)
{
  int i;
  sscanf(p,"%d",&i);
        audioFilterNormalizeMode(i);	
}
++ avidemux/ADM_video/ADM_vidMPdelogo.cpp

	memset(vf->priv, 0, sizeof(struct vf_priv_s));
    }

    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

{
int hh,mm,ss,ms,o;
uint64_t ti;
unsigned long long pos;

        ADM_assert(line<sub->nbLines);

        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

            /* 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",
                    &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);

                }
            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, qscan[i], row, fname);
                    i = -1;
                    break;
                    }

Return to bug 104753

Line Link Here

(-)file_not_specified_in_diff (-35 / +42 lines)
0	-- avidemux/ADM_encoder/adm_encConfig.cpp	0	++ avidemux/ADM_encoder/adm_encConfig.cpp
Lines 772-778 Link Here
772	//***	772	//***
773		773
774	fgets (str, 200, fd); // here we got the conf	774	fgets (str, 200, fd); // here we got the conf
775	fscanf (fd, "Video extraConf size : %lu\n", &extraSize);	775	unsigned long d; fscanf (fd, "Video extraConf size : %lu\n", &d); extraSize = d;
776	if (extraSize)	776	if (extraSize)
777	{	777	{
778	uint8_t *ptr;	778	uint8_t *ptr;
779	-- avidemux/ADM_mpegdemuxer/dmx_audio.cpp	779	++ avidemux/ADM_mpegdemuxer/dmx_audio.cpp
Lines 79-89 Link Here
79	FILE *file;	79	FILE *file;
80	uint32_t dummy; //,audio=0;	80	uint32_t dummy; //,audio=0;
81	char string[MAX_LINE]; //,str[1024];;	81	char string[MAX_LINE]; //,str[1024];;
82	uint32_t w = 720, h = 576, fps = 0;	82	int w = 720, h = 576, fps = 0;
83	uint8_t type, progressif;	83	char type, progressif;
84	char realname[1024];	84	char realname[1024];
85	uint32_t aPid, vPid, aPes,mainAudio;	85	int aPid, vPid, aPes,mainAudio;
86	uint32_t nbGop, nbFrame,nbAudioStream;	86	int nbGop, nbFrame,nbAudioStream;
87	int multi;	87	int multi;
88		88
89	file=fopen(name,"rt");	89	file=fopen(name,"rt");
Lines 205-212 Link Here
205		205
206	printf ("Building index with %u sync points\n", nbGop);	206	printf ("Building index with %u sync points\n", nbGop);
207		207
208	uint32_t read = 0, img, count;	208	uint32_t read = 0;
209	uint64_t abs;	209	int img, abs;
		210	long count;
210		211
211		212
212	while (read < nbGop)	213	while (read < nbGop)
213	-- avidemux/ADM_mpegdemuxer/dmx_video.cpp	214	++ avidemux/ADM_mpegdemuxer/dmx_video.cpp
Lines 185-195 Link Here
185	{	185	{
186	FILE *file;	186	FILE *file;
187		187
188	uint32_t w=720,h=576,fps=0;	188	int w=720,h=576,fps=0;
189	uint8_t type,progressif;	189	int type,progressif;
190	char realname[1024];	190	char realname[1024];
191	uint32_t dummy;	191	uint32_t dummy;
192	uint32_t vPid,vTsId;	192	int vPid,vTsId;
193		193
194	char string[MAX_LINE+1]; //,str[1024];;	194	char string[MAX_LINE+1]; //,str[1024];;
195	uint8_t interlac=0;	195	uint8_t interlac=0;
Lines 242-251 Link Here
242	sscanf(string,"Picture : %u x %u %u fps\n",&w,&h,&fps); // width...	242	sscanf(string,"Picture : %u x %u %u fps\n",&w,&h,&fps); // width...
243		243
244	fgets(string,MAX_LINE,file);	244	fgets(string,MAX_LINE,file);
245	sscanf(string,"Nb Gop : %u \n",&_nbGop); // width...	245	{ unsigned int i;
		246	sscanf(string,"Nb Gop : %u \n",&i); _nbGop=i;}// width...
246		247
247	fgets(string,MAX_LINE,file);	248	fgets(string,MAX_LINE,file);
248	sscanf(string,"Nb Images: %u \n",&_nbFrames); // width...	249	{ unsigned int i;
		250	sscanf(string,"Nb Images: %u \n",&i); _nbFrames=i;}// width...
249		251
250	fgets(string,MAX_LINE,file);	252	fgets(string,MAX_LINE,file);
251	//fscanf(string,"Nb Audio : %u\n",0);	253	//fscanf(string,"Nb Audio : %u\n",0);
Lines 317-327 Link Here
317	// -------------- Read the file (video)---------------------	319	// -------------- Read the file (video)---------------------
318	uint32_t read=0;	320	uint32_t read=0;
319	uint32_t currentImage=0;	321	uint32_t currentImage=0;
320	uint32_t gop,imageStart,imageNb;	322	int gop,imageStart,imageNb;
321	uint64_t abs,rel;	323	uint64_t abs,rel;
322	uint8_t imgtype;	324	char imgtype;
323	uint32_t imgsize;	325	int imgsize;
324	uint64_t imgrel,imgabs;	326	long long imgrel,imgabs;
325	char str,needle;	327	char str,needle;
326		328
327	DIA_working *work=new DIA_working("Opening mpeg..");	329	DIA_working *work=new DIA_working("Opening mpeg..");
328	-- avidemux/ADM_ogm/ADM_ogm.cpp	330	++ avidemux/ADM_ogm/ADM_ogm.cpp
Lines 264-270 Link Here
264	if(!strcmp(str,"audio"))	264	if(!strcmp(str,"audio"))
265	{	265	{
266	memcpy(&header,buffer,sizeof(header));	266	memcpy(&header,buffer,sizeof(header));
267	uint32_t codec;	267	unsigned int codec;
268	OINFO(subtype,4);	268	OINFO(subtype,4);
269	sscanf(str,"%x",&codec);	269	sscanf(str,"%x",&codec);
270	printf("Audio fourcc:%d (%x)\n",codec,codec);	270	printf("Audio fourcc:%d (%x)\n",codec,codec);
271	-- avidemux/ADM_toolkit/automation.cpp	271	++ avidemux/ADM_toolkit/automation.cpp
Lines 323-329 Link Here
323		323
324	void call_normalize (char *p)	324	void call_normalize (char *p)
325	{	325	{
326	int32_t i;	326	int i;
327	sscanf(p,"%d",&i);	327	sscanf(p,"%d",&i);
328	audioFilterNormalizeMode(i);	328	audioFilterNormalizeMode(i);
329	}	329	}
330	-- avidemux/ADM_video/ADM_vidMPdelogo.cpp	330	++ avidemux/ADM_video/ADM_vidMPdelogo.cpp
Lines 342-351 Link Here
342	memset(vf->priv, 0, sizeof(struct vf_priv_s));	342	memset(vf->priv, 0, sizeof(struct vf_priv_s));
343	}	343	}
344		344
345	if (args) res = sscanf(args, "%d:%d:%d:%d:%d",	345	if (args)
346	&vf->priv->xoff, &vf->priv->yoff,	346	{ int a,b,c,d,e;
347	&vf->priv->lw, &vf->priv->lh,	347	res = sscanf(args, "%d:%d:%d:%d:%d",a,b,c,d,e);
348	&vf->priv->band);	348	vf->priv->xoff=a; vf->priv->yoff=b;
		349	vf->priv->lw=c; &vf->priv->lh=d;
		350	vf->priv->band=e;
349	if (args && (res != 5)) {	351	if (args && (res != 5)) {
350	uninit(vf);	352	uninit(vf);
351	return 0; // bad syntax	353	return 0; // bad syntax
352	-- avidemux/ADM_video/ADM_vobsubinfo.cpp	354	++ avidemux/ADM_video/ADM_vobsubinfo.cpp
Lines 45-55 Link Here
45	{	45	{
46	int hh,mm,ss,ms,o;	46	int hh,mm,ss,ms,o;
47	uint64_t ti;	47	uint64_t ti;
48	uint32_t pos;	48	unsigned long long pos;
49		49
50	ADM_assert(line<sub->nbLines);	50	ADM_assert(line<sub->nbLines);
51		51
52	o=sscanf(str,"timestamp: %d:%d:%d:%d, filepos: %x\n",&hh,&mm,&ss,&ms,&pos);	52	o=sscanf(str,"timestamp: %d:%d:%d:%d, filepos: %llx\n",&hh,&mm,&ss,&ms,&pos);
53	ADM_assert(o==5);	53	ADM_assert(o==5);
54		54
55	ti=hh3600+mm60+ss;	55	ti=hh3600+mm60+ss;
56	-- avidemux/mpeg2enc/mpeg2setup.cc	56	++ avidemux/mpeg2enc/mpeg2setup.cc
Lines 1366-1374 Link Here
1366	/* Empty lines (\n only) and comments are ignored */	1366	/* Empty lines (\n only) and comments are ignored */
1367	if ((strlen(line) == 1) \|\| line[0] == '#')	1367	if ((strlen(line) == 1) \|\| line[0] == '#')
1368	continue;	1368	continue;
		1369	unsigned int qscan[8];
1369	j = sscanf(line, "%hu,%hu,%hu,%hu,%hu,%hu,%hu,%hu\n",	1370	j = sscanf(line, "%hu,%hu,%hu,%hu,%hu,%hu,%hu,%hu\n",
1370	&q[i+0], &q[i+1], &q[i+2], &q[i+3],	1371	&qscan[0], &qscan[1], &qscan[2], &qscan[3],
1371	&q[i+4], &q[i+5], &q[i+6], &q[i+7]);	1372	&qscan[4], &qscan[5], &qscan[6], &qscan[7]);
1372	if (j != 8)	1373	if (j != 8)
1373	{	1374	{
1374	mjpeg_error("line %d ('%s') of '%s' malformed", row, line, fname);	1375	mjpeg_error("line %d ('%s') of '%s' malformed", row, line, fname);
Lines 1376-1385 Link Here
1376	}	1377	}
1377	for (j = 0; j < 8; j++)	1378	for (j = 0; j < 8; j++)
1378	{	1379	{
		1380	q[i + j] = (uint16_t)qscan[j];
1379	if (q[i + j] < 1 \|\| q[i + j] > 255)	1381	if (q[i + j] < 1 \|\| q[i + j] > 255)
1380	{	1382	{
1381	mjpeg_error("entry %d (%u) in line %d from '%s' invalid",	1383	mjpeg_error("entry %d (%u) in line %d from '%s' invalid",
1382	j, q[i + j], row, fname);	1384	j, qscan[i], row, fname);
1383	i = -1;	1385	i = -1;
1384	break;	1386	break;
1385	}	1387	}