--- avidemux/ADM_audiofilter/audiodeng_buildfilters.cpp +++ avidemux/ADM_audiofilter/audiodeng_buildfilters.cpp @@ -226,7 +226,7 @@ { \ tmp+=strlen(#x); \ aprintf("-- %s\n",tmp); \ - sscanf(tmp,"=%d ",&x); \ + sscanf(tmp,"=%d ",&x); /* Patch needed? */\ } \ else \ { printf("*** %s not found !***\n",#x);} \ --- avidemux/ADM_editor/ADM_edLoadSave.cpp +++ avidemux/ADM_editor/ADM_edLoadSave.cpp @@ -155,7 +155,7 @@ char str_extra[4000]; char str_tmp[4000]; char filename2[1024]; - uint32_t nb; + unsigned long nb; FILE * fd; char * tmp; char *s; @@ -231,11 +231,12 @@ fscanf (fd, "%02lu segments\n", &nb); printf ("WKB Reading workbench, %ld segments to go\n", nb); _nb_segment=nb; - for (uint32_t i = 0; i < nb; i++) + for (unsigned long i = 0; i < nb; i++) { - fscanf (fd, "Start : %lu\n", &_segments[i]._start_frame); - fscanf (fd, "Size : %lu\n", &_segments[i]._nb_frames); - fscanf (fd, "Ref : %lu\n", &_segments[i]._reference); + unsigned long s; + fscanf (fd, "Start : %lu\n", &s); _segments[i]._start_frame=s; + fscanf (fd, "Size : %lu\n", &s); _segments[i]._nb_frames=s; + fscanf (fd, "Ref : %lu\n", &s); _segments[i]._reference=s; updateAudioTrack (i); printf("segment :%lu done\n",i); } @@ -250,8 +251,8 @@ fgets(str,200,fd); audioCodecSetConf(str); - - if(2==fscanf(fd,"Video start-end : %lu %lu\n",&edFrameStart,&edFrameEnd)) + unsigned long sca,scb; + if(2==fscanf(fd,"Video start-end : %lu %lu\n",&sca,&scb)) { uint8_t val = 0; prefs->get(FEATURE_IGNORESAVEDMARKERS,&val); @@ -267,6 +268,7 @@ { _haveMarkers=0; } + edFrameStart=sca; edFrameEnd=scb; int cont; if(1==fscanf(fd,"container :%d\n", &cont)) { --- avidemux/ADM_encoder/adm_encConfig.cpp +++ avidemux/ADM_encoder/adm_encConfig.cpp @@ -496,7 +496,7 @@ { \ tmp+=strlen(#x); \ aprintf("-- %s\n",tmp); \ - sscanf(tmp,"=%d ",&x); \ + int sx; sscanf(tmp,"=%d ",&sx); x=sx; \ } \ else \ { printf("*** %s not found !***\n",#x);} \ @@ -1397,7 +1397,7 @@ char str_extra[4000]; char str_tmp[4000]; uint32_t nb; -uint32_t extraSize=0; +unsigned long extraSize=0; uint8_t *extra=NULL; fd=fopen(name,"rt"); --- avidemux/ADM_mpeg2dec/ADM_mpegAudio.cpp +++ avidemux/ADM_mpeg2dec/ADM_mpegAudio.cpp @@ -58,11 +58,11 @@ { FILE *file; int type=0,id; - uint8_t ctype=0; + char ctype=0; uint64_t abs; - uint32_t dummy;//,audio=0; + unsigned long dummy;//,audio=0; char string[1025]; //,str[1024];; - uint8_t interlaced; + unsigned char interlaced; _sync= NULL; _wavheader=NULL; @@ -75,7 +75,7 @@ } fgets(string,1023,file); // File header - sscanf(string,"IDX%c %c %x",&interlaced,(char*)&ctype,&id); + sscanf(string,"IDX%c %c %x",&interlaced,&ctype,&id); type=ctype; fgets(string,1023,file); // # of frames fgets(string,1023,file); // nb file @@ -116,9 +116,9 @@ fgets(string,1023,file); // Size x*y // Now I Offset + nb B/P frames - uint8_t t; - uint64_t of; - uint32_t sz; + unsigned char t; + unsigned long long of; + unsigned long sz; printf("\n looking up %lu sync points\n",nb_sync); for(uint32_t y=0;ynbLines); @@ -145,7 +145,9 @@ { if(!strncmp(str,"size:",5)) // Catch original screen dimension { - sscanf(str,"size:%lux%lu",&(sub->width),&(sub->height)); + unsigned long w,h; + sscanf(str,"size:%lux%lu",&w,&h); + sub->width=w;sub->height=h; } } @@ -217,7 +219,8 @@ { char str[1024]; char s[16]; - uint32_t nb=0,index; + uint32_t nb=0; + int index; FILE *fd=NULL; fd=fopen(filename,"rb"); --- avidemux/mpeg2enc/mpeg2setup.cc +++ avidemux/mpeg2enc/mpeg2setup.cc @@ -1340,7 +1340,7 @@ int parse_custom_matrixfile(char *fname, int dbug) { FILE *fp; - uint16_t q[128]; + unsigned int q[128]; int i, j, row; char line[80];