Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 97047 Details for
Bug 104753
avidemux cannot load project on AMD64
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch to fix the scanf/fscanf calls
avidemux-2.0.42-scanf.patch (text/plain), 9.61 KB, created by
Martin Väth
on 2006-09-15 06:21:17 UTC
(
hide
)
Description:
Patch to fix the scanf/fscanf calls
Filename:
MIME Type:
Creator:
Martin Väth
Created:
2006-09-15 06:21:17 UTC
Size:
9.61 KB
patch
obsolete
>--- 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;y<nb_sync;) > { >--- avidemux/ADM_mpeg2dec/ADM_mpegscan.cpp >+++ avidemux/ADM_mpeg2dec/ADM_mpegscan.cpp >@@ -101,13 +101,13 @@ > { > FILE *file; > >- uint32_t w=720,h=576,fps=0; >+ unsigned int w=720,h=576,fps=0; > uint8_t type; >- uint64_t abs; >- uint32_t dummy,audio=0; >+ unsigned long long abs; >+ int dummy,audio=0; > > char string[1024]; //,str[1024];; >- uint8_t interlac=0; >+ char interlac=0; > > printf("\n opening d2v file : %s\n",name); > file=fopen(name,"rt"); >@@ -129,8 +129,9 @@ > } > > fgets(string,1023,file); // # of I frames >- sscanf(string,"%X",&_nbFrames); >- printf(" %d I-Frames\n", _nbFrames); >+ int iframes; >+ sscanf(string,"%X",&iframes);_nbFrames=iframes; >+ printf(" %d I-Frames\n", iframes); > > fgets(string,1023,file); // nb file > printf(" Nb files : %s\n",string); >@@ -179,9 +180,9 @@ > > > // Now I Offset + nb B/P frames >- uint8_t t; >- uint64_t of; >- uint32_t sz; >+ unsigned char t; >+ unsigned long long of; >+ unsigned int sz; > > DIA_working *work=new DIA_working("Opening mpeg.."); > >--- avidemux/ADM_nuv/ADM_nuv.cpp >+++ avidemux/ADM_nuv/ADM_nuv.cpp >@@ -1310,17 +1310,20 @@ > > printf("\n ******** Nuppel index detected **********\n"); > >- fscanf(fd,"wh: %lu %lu\n",&w,&h ); // mark it as a avidemux index >- fscanf(fd,"fps: %lu\n",&fps ); >- fscanf(fd,"Lzo Pos:%llu\n",&_lzo_pos); >- fscanf(fd,"Lzo Size:%llu\n",&_lzo_size); >+ unsigned long sca,scb; >+ fscanf(fd,"wh: %lu %lu\n",&sca,&scb );w=sca;h=scb; // mark it as a avidemux index >+ fscanf(fd,"fps: %lu\n",&sca ); fps=sca; >+ unsigned long long scl; >+ fscanf(fd,"Lzo Pos:%llu\n",&scl);_lzo_pos=scl; >+ fscanf(fd,"Lzo Size:%llu\n",&scl);_lzo_size=scl; > fgets(str,1000,fd); >- fscanf(fd,"Myth:%d\n",&_isMyth); >- fscanf(fd,"Xvid:%d\n",&_isXvid); >- fscanf(fd,"FFV1:%d\n",&_isFFV1); >- fscanf(fd,"ff4c:%x\n",&_ffv1_fourcc); >+ long scs; >+ fscanf(fd,"Myth:%d\n",&scs);_isMyth=scs; >+ fscanf(fd,"Xvid:%d\n",&scs);_isXvid=scs; >+ fscanf(fd,"FFV1:%d\n",&scs);_isFFV1=scs; >+ fscanf(fd,"ff4c:%x\n",&scs);_ffv1_fourcc=scs; > >- fscanf(fd,"extr:%x\n",&_ffv1_extraLen); >+ fscanf(fd,"extr:%x\n",&scs);_ffv1_extraLen=scs; > if(_ffv1_extraLen) > { > char *start; >@@ -1340,9 +1343,9 @@ > > } > >- fscanf(fd,"PCM:%d\n",&_isPCM); >- fscanf(fd,"Fq:%d\n",&_audio_frequency); >- fscanf(fd,"%lu video frames\n",&nb); >+ fscanf(fd,"PCM:%d\n",&scs);_isPCM=scs; >+ fscanf(fd,"Fq:%d\n",&scs);_audio_frequency=scs; >+ fscanf(fd,"%lu video frames\n",&sca);nb=sca; > > aprintf("fps : %lu\n",fps ); > aprintf("Lzo Pos :%llu Size:%llu\n",_lzo_pos,_lzo_size); >@@ -1381,9 +1384,10 @@ > //printf("%s",str); > sscanf(str,"Comp:%c Pos :%llu Size:%lu Kf:%lu\n", > &(_videoIndex[j]._compression), >- &(_videoIndex[j]._pos), >- &(_videoIndex[j]._len), >- &(_videoIndex[j]._kf)); >+ &scl, &sca, &scb); >+ _videoIndex[j]._pos=scl; >+ _videoIndex[j]._len=sca; >+ _videoIndex[j]._kf=scb; > /* > printf("Comp:%c Pos :%llu Size:%lu Kf:%u\n", > (_videoIndex[j]._compression), >@@ -1449,7 +1453,7 @@ > _old=new uint8_t [ DXFIELD(height)*DXFIELD(width)*3]; // too much > memset(_old,0,DXFIELD(height)*DXFIELD(width)*3); > // time to do the audio >- uint32_t nbc=0; >+ unsigned long nbc=0; > aprintf("\n Reading audio...\n"); > fgets(str,1000,fd); > printf("%s\n",str); >@@ -1463,9 +1467,9 @@ > { > fscanf(fd,"Comp:%c Pos :%llu Size:%lu\n", > &_audioIndex[j]._compression, >- &_audioIndex[j]._pos, >- &_audioIndex[j]._len >- ); >+ &scl, &sca); >+ _audioIndex[j]._pos=scl; >+ _audioIndex[j]._len=sca; > } > _audioTrack=new nuvAudio(_audioIndex,nbc,_fd,_audio_frequency,NULL); > _isaudiopresent=1; >--- avidemux/ADM_ogm/ADM_ogm.cpp >+++ avidemux/ADM_ogm/ADM_ogm.cpp >@@ -255,7 +255,7 @@ > } > if(!strcmp(str,"audio")) > { >- uint32_t codec; >+ 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 >@@ -407,9 +407,9 @@ > void call_setAudio (char *p) > { > >- int32_t i; >+ long i; > sscanf(p,"%ld",&i); >- audioFilterDelay(i); >+ audioFilterDelay((int32_t)i); > } > void call_audiocodec(char *p) > { >@@ -450,10 +450,10 @@ > void call_audiobitrate(char *p) > { > >- int32_t i; >+ long i; > sscanf(p,"%ld",&i); > printf("\n Audio bitrate %ld\n",i); >- audioFilter_SetBitrate(i); >+ audioFilter_SetBitrate((int32_t)i); > } > void call_fps(char *p) > { >@@ -477,24 +477,24 @@ > void call_autosplit(char *p) > { > >- int32_t i; >+ long i; > sscanf(p,"%ld",&i); >- ADM_aviSetSplitSize(i); >+ ADM_aviSetSplitSize((int32_t)i); > } > > void setBegin(char *p) > { >-uint32_t i; >+unsigned long i; > sscanf(p,"%lu",&i); > frameStart=i; >- printf("\n Start %lu\n",frameStart); >+ printf("\n Start %lu\n",i); > } > void setEnd(char *p) > { >-uint32_t i; >+unsigned long i; > sscanf(p,"%lu",&i); > frameEnd=i; >- printf("\n End %lu\n",frameStart); >+ printf("\n End %lu\n",i); > > } > void call_help(char *p) >@@ -519,9 +519,9 @@ > } > void call_indexMpeg(char *in,char *out, char *id) > { >-uint32_t aid; >+unsigned long aid; > if(id==NULL) return; >- sscanf(id,"%x",&aid); >+ sscanf(id,"%lx",&aid); > indexMpeg(in,out,(uint8_t)aid); > printf("\n __\n"); > } >--- avidemux/ADM_video/ADM_vobsubinfo.cpp >+++ avidemux/ADM_video/ADM_vobsubinfo.cpp >@@ -45,7 +45,7 @@ > { > int hh,mm,ss,ms,o; > uint64_t ti; >-uint32_t pos; >+unsigned int pos; > > ADM_assert(line<sub->nbLines); > >@@ -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]; >
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=97047">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 104753
: 97047 |
102303
