From 6e9cbdc10448203e7c8b2de41447442fcc9f7bae Mon Sep 17 00:00:00 2001 From: diego Date: Wed, 13 May 2009 02:58:57 +0000 Subject: whitespace cosmetics: Remove all trailing whitespace. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29305 b3059339-0415-0410-9bf9-f77b7e298cf2 --- TOOLS/aconvert.sh | 2 +- TOOLS/bmovl-test.c | 8 ++++---- TOOLS/calcbpp.pl | 2 +- TOOLS/divx2svcd.sh | 2 +- TOOLS/mencvcd.sh | 18 +++++++++--------- TOOLS/modify_reg.c | 2 +- TOOLS/movinfo.c | 28 ++++++++++++++-------------- TOOLS/netstream.c | 14 +++++++------- TOOLS/plotpsnr.pl | 2 +- TOOLS/qepdvcd.sh | 12 ++++++------ TOOLS/realcodecs/14_4.c | 10 +++++----- TOOLS/realcodecs/28_8.c | 10 +++++----- TOOLS/realcodecs/cook.c | 10 +++++----- TOOLS/realcodecs/drv2.c | 34 +++++++++++++++++----------------- TOOLS/realcodecs/drv3.c | 24 ++++++++++++------------ TOOLS/realcodecs/drv4.c | 24 ++++++++++++------------ TOOLS/realcodecs/ra.c | 6 +++--- TOOLS/realcodecs/rv30.c | 4 ++-- TOOLS/realcodecs/sipr.c | 10 +++++----- TOOLS/subrip.c | 2 +- TOOLS/vivodump.c | 10 +++++----- TOOLS/vobshift.py | 6 +++--- TOOLS/w32codec_dl.pl | 16 ++++++++-------- 23 files changed, 128 insertions(+), 128 deletions(-) (limited to 'TOOLS') diff --git a/TOOLS/aconvert.sh b/TOOLS/aconvert.sh index 37a031115f..1cae2732eb 100755 --- a/TOOLS/aconvert.sh +++ b/TOOLS/aconvert.sh @@ -9,5 +9,5 @@ if [ "$1" = "" ]; then fi options=${3:-"-oac mp3lame"} - + mencoder -demuxer rawvideo -rawvideo w=1:h=1 -ovc copy -of rawaudio -endpos `mplayer -identify $1 -frames 0 2>&1 | grep ID_LENGTH | cut -d "=" -f 2` -audiofile $1 -o $2 $options $1 diff --git a/TOOLS/bmovl-test.c b/TOOLS/bmovl-test.c index cb4b4ebf8b..45fa409dce 100644 --- a/TOOLS/bmovl-test.c +++ b/TOOLS/bmovl-test.c @@ -15,10 +15,10 @@ blit(int fifo, unsigned char *bitmap, int width, int height, { char str[100]; int nbytes; - + sprintf(str, "RGBA32 %d %d %d %d %d %d\n", width, height, xpos, ypos, alpha, clear); - + if(DEBUG) printf("Sending %s", str); write(fifo, str, strlen(str)); @@ -33,7 +33,7 @@ set_alpha(int fifo, int width, int height, int xpos, int ypos, int alpha) { sprintf(str, "ALPHA %d %d %d %d %d\n", width, height, xpos, ypos, alpha); - + if(DEBUG) printf("Sending %s", str); write(fifo, str, strlen(str)); @@ -110,7 +110,7 @@ int main(int argc, char **argv) { for(i=-255; i <= 0; i++) set_alpha(fifo, image->w, image->h, (width/2)-(image->w/2), (height/2)-(image->h/2), i); - + // Clean up free(bitmap); diff --git a/TOOLS/calcbpp.pl b/TOOLS/calcbpp.pl index 85fbb7a683..e1626f8ce8 100755 --- a/TOOLS/calcbpp.pl +++ b/TOOLS/calcbpp.pl @@ -4,7 +4,7 @@ use POSIX; sub round { my $v = shift; - + return floor($v + 0.5); } diff --git a/TOOLS/divx2svcd.sh b/TOOLS/divx2svcd.sh index 4782dd679c..4192e0f782 100755 --- a/TOOLS/divx2svcd.sh +++ b/TOOLS/divx2svcd.sh @@ -315,7 +315,7 @@ if [ "$burning" = 1 ]; then cat <1?argv[1]:"Akira.mov","rb")) == NULL) return 1; diff --git a/TOOLS/netstream.c b/TOOLS/netstream.c index 300b1d3f80..e7f95817e5 100644 --- a/TOOLS/netstream.c +++ b/TOOLS/netstream.c @@ -108,7 +108,7 @@ static int net_stream_open(client_t* cl,char* url) { static int net_stream_fill_buffer(client_t* cl,uint16_t max_len) { int r; mp_net_stream_packet_t *pack; - + if(!cl->stream) { if(!write_error(cl->fd,"No stream is currently opened\n")) return 0; @@ -132,7 +132,7 @@ static int net_stream_fill_buffer(client_t* cl,uint16_t max_len) { } static int net_stream_seek(client_t* cl, uint64_t pos) { - + if(!cl->stream) { if(!write_error(cl->fd,"No stream is currently opened\n")) return 0; @@ -180,7 +180,7 @@ static int handle_client(client_t* cl,mp_net_stream_packet_t* pack) { if(!pack) return 0; - + switch(pack->cmd) { case NET_STREAM_OPEN: if(((char*)pack)[pack->len-1] != '\0') { @@ -239,7 +239,7 @@ static int make_fd_set(fd_set* fds, client_t** _cl, int listen) { if(cl->stream) free_stream(cl->stream); if(!cl->prev) // Remove the head *_cl = cl->next; - cl = cl->next; + cl = cl->next; free(f); continue; } @@ -276,7 +276,7 @@ static int main_loop(int listen_fd) { signal(SIGHUP,exit_sig); // kill -HUP / xterm closed signal(SIGINT,exit_sig); // Interrupt from keyboard signal(SIGQUIT,exit_sig); // Quit from keyboard -#endif +#endif while(run_server) { int sel_n = make_fd_set(&fds,&clients,listen_fd); @@ -338,7 +338,7 @@ int main(void) { mp_msg_init(); // mp_msg_set_level(verbose+MSGL_STATUS); - + #ifdef __MINGW32__ WSADATA wsaData; WSAStartup(MAKEWORD(1,1), &wsaData); @@ -356,7 +356,7 @@ int main(void) { mp_msg(MSGT_NETST,MSGL_FATAL,"Failed to bind listen socket: %s\n",strerror(errno)); return -1; } - + if(listen(listen_fd,1)) { mp_msg(MSGT_NETST,MSGL_FATAL,"Failed to turn the socket in listen state: %s\n",strerror(errno)); diff --git a/TOOLS/plotpsnr.pl b/TOOLS/plotpsnr.pl index 321dc3bf39..8124d317b5 100755 --- a/TOOLS/plotpsnr.pl +++ b/TOOLS/plotpsnr.pl @@ -216,7 +216,7 @@ sub commandline { "iframes" => \$options{iframes}, "pframes" => \$options{pframes}, "bframes" => \$options{bframes}, - "aframes" => sub { $options{iframes} = 1; + "aframes" => sub { $options{iframes} = 1; $options{pframes} = 1; $options{bframes} = 1; }, "qs=s" => \$options{qs}, diff --git a/TOOLS/qepdvcd.sh b/TOOLS/qepdvcd.sh index a436e17c37..0cc1e187e5 100755 --- a/TOOLS/qepdvcd.sh +++ b/TOOLS/qepdvcd.sh @@ -3,23 +3,23 @@ # QEPDVCD # # Most of this stuff comes straight from MPlayer documentation. -# Options are limited only to a small useful subset, if you +# Options are limited only to a small useful subset, if you # want more control, RTFM and DIY. # # Version: 0.1 # # Licence: GPL # -# Author: Reynaldo H. Verdejo Pinochet +# Author: Reynaldo H. Verdejo Pinochet # -# Script: MPlayer Sources. Anything supported to vcd/svcd pal/ntsc +# Script: MPlayer Sources. Anything supported to vcd/svcd pal/ntsc # # requires: mencoder # -# sugests: vcdimager / cdrecord +# sugests: vcdimager / cdrecord # # Thanks to: Carlos Navarro Salas - name author ;) -# +# # # Defaults @@ -276,7 +276,7 @@ for j in $(seq 0 $CICLES); do fi done fi - + # Mencoder Time ;-) ################################################### mencoder \ diff --git a/TOOLS/realcodecs/14_4.c b/TOOLS/realcodecs/14_4.c index 6def97af46..f0e1762f4e 100644 --- a/TOOLS/realcodecs/14_4.c +++ b/TOOLS/realcodecs/14_4.c @@ -137,7 +137,7 @@ void hexdump(void *pos, int len) { int lines=(len+15)>>4; while(lines--) { int len1=len, i; - fprintf(stderr, "%0x ", cpos); + fprintf(stderr, "%0x ", cpos); cpos1=cpos; for (i=0;i<16;i++) { if (len1>0) { @@ -157,7 +157,7 @@ void hexdump(void *pos, int len) { } len--; } - fputs("\n", stderr); + fputs("\n", stderr); } fputc('\n', stderr); } @@ -177,7 +177,7 @@ static int pkno=0; ulong RADecode(ulong p1,ulong p2,ulong p3,ulong p4,ulong* p5,ulong p6) { ulong result; int x,y; - + fprintf(stderr, "RADecode(ulong ctx=0x%0lx, ", p1); fprintf(stderr, "ulong src=0x%0lx,\n", p2); fprintf(stderr, "ulong len=0x%0lx,", p3); @@ -261,7 +261,7 @@ ulong RAInitDecoder(ulong p1,ulong p2) { // memset(temp2,0x77,256); // memcpy(temp2,temp[6],16); // temp[6]=temp2; - + result=(*raInitDecoder)(p1,/*temp*/p2); // hexdump((void*)temp[6], 32); // memcpy(p2,temp,4*11); @@ -310,6 +310,6 @@ ulong RASetFlavor(ulong p1) { fputs("######################## FLAVOR PROPERTIES ###################\n\n", stderr); #endif - + return result; } diff --git a/TOOLS/realcodecs/28_8.c b/TOOLS/realcodecs/28_8.c index 6634c4afde..c9aa525bb9 100644 --- a/TOOLS/realcodecs/28_8.c +++ b/TOOLS/realcodecs/28_8.c @@ -137,7 +137,7 @@ void hexdump(void *pos, int len) { int lines=(len+15)>>4; while(lines--) { int len1=len, i; - fprintf(stderr, "%0x ", cpos); + fprintf(stderr, "%0x ", cpos); cpos1=cpos; for (i=0;i<16;i++) { if (len1>0) { @@ -157,7 +157,7 @@ void hexdump(void *pos, int len) { } len--; } - fputs("\n", stderr); + fputs("\n", stderr); } fputc('\n', stderr); } @@ -177,7 +177,7 @@ static int pkno=0; ulong RADecode(ulong p1,ulong p2,ulong p3,ulong p4,ulong* p5,ulong p6) { ulong result; int x,y; - + fprintf(stderr, "RADecode(ulong ctx=0x%0lx, ", p1); fprintf(stderr, "ulong src=0x%0lx,\n", p2); fprintf(stderr, "ulong len=0x%0lx,", p3); @@ -261,7 +261,7 @@ ulong RAInitDecoder(ulong p1,ulong p2) { // memset(temp2,0x77,256); // memcpy(temp2,temp[6],16); // temp[6]=temp2; - + result=(*raInitDecoder)(p1,/*temp*/p2); // hexdump((void*)temp[6], 32); // memcpy(p2,temp,4*11); @@ -310,6 +310,6 @@ ulong RASetFlavor(ulong p1) { fputs("######################## FLAVOR PROPERTIES ###################\n\n", stderr); #endif - + return result; } diff --git a/TOOLS/realcodecs/cook.c b/TOOLS/realcodecs/cook.c index 8a8310d72e..0cbd43af54 100644 --- a/TOOLS/realcodecs/cook.c +++ b/TOOLS/realcodecs/cook.c @@ -184,7 +184,7 @@ void hexdump(void *pos, int len) { int lines=(len+15)>>4; while(lines--) { int len1=len, i; - fprintf(stderr, "%0x ", cpos); + fprintf(stderr, "%0x ", cpos); cpos1=cpos; for (i=0;i<16;i++) { if (len1>0) { @@ -204,7 +204,7 @@ void hexdump(void *pos, int len) { } len--; } - fputs("\n", stderr); + fputs("\n", stderr); } fputc('\n', stderr); } @@ -224,7 +224,7 @@ static int pkno=0; ulong RADecode(ulong p1,ulong p2,ulong p3,ulong p4,ulong* p5,ulong p6) { ulong result; int x,y; - + fprintf(stderr, "RADecode(ulong ctx=0x%0lx, ", p1); fprintf(stderr, "ulong src=0x%0lx,\n", p2); fprintf(stderr, "ulong len=0x%0lx,", p3); @@ -344,7 +344,7 @@ ulong RAInitDecoder(ulong p1,ulong p2) { memset(temp2,0x77,256); memcpy(temp2,temp[6],16); temp[6]=temp2; - + result=(*raInitDecoder)(p1,temp); hexdump((void*)temp[6], 32); // memcpy(p2,temp,4*11); @@ -414,7 +414,7 @@ ulong RASetFlavor(ulong p1,ulong p2) { fputs("######################## FLAVOR PROPERTIES ###################\n\n", stderr); #endif - + return result; } diff --git a/TOOLS/realcodecs/drv2.c b/TOOLS/realcodecs/drv2.c index c4de76f1f2..278188afea 100644 --- a/TOOLS/realcodecs/drv2.c +++ b/TOOLS/realcodecs/drv2.c @@ -161,7 +161,7 @@ static void hexdump(void *pos, int len) { int lines=(len+15)>>4; while(lines--) { int len1=len, i; - fprintf(stderr, "#R# %0x ", (int)cpos-(int)pos); + fprintf(stderr, "#R# %0x ", (int)cpos-(int)pos); cpos1=cpos; for (i=0;i<16;i++) { if (len1>0) { @@ -181,7 +181,7 @@ static void hexdump(void *pos, int len) { } len--; } - fputs("\n", stderr); + fputs("\n", stderr); } fputc('\n', stderr); } @@ -195,15 +195,15 @@ ulong RV20toYUV420CustomMessage(ulong* p1,ulong p2) { /* if(p1[0]!=17) return 0; - + if(p1[1]!=1) return 0; - + if(p1[0]==105) return 0; if(p1[0]==3) return 0; if(p1[0]==18) return 0; if(p1[0]==30) return 0; */ - + if(p1[0]==0x24){ #if 1 hexdump(p1[2],64); @@ -257,9 +257,9 @@ ulong RV20toYUV420HiveMessage(ulong *p1,ulong p2) { // hexdump((void*)p1, sizeof(struct init_data)); fprintf(stderr,">HIVE %ld %p\n",p1[0],p1[1]); - + if(p1[0]!=0) return 0; - + p1[1]=0x10000000; return 0; @@ -267,7 +267,7 @@ ulong RV20toYUV420HiveMessage(ulong *p1,ulong p2) { memset(h_temp,0x77,1000); memcpy(h_temp,p1,4); // fprintf(stderr,"COPY OK!\n"); - + // tic(); // result=(*rvyuvHiveMessage)(p1,p2); result=(*rvyuvHiveMessage)(h_temp,p2); @@ -281,7 +281,7 @@ ulong RV20toYUV420HiveMessage(ulong *p1,ulong p2) { // p1[0]=0; // p1[1]=0x20000000; - + fprintf(stderr,">4; while(lines--) { int len1=len, i; - fprintf(stderr, "#R# %0x ", (int)cpos-(int)pos); + fprintf(stderr, "#R# %0x ", (int)cpos-(int)pos); cpos1=cpos; for (i=0;i<16;i++) { if (len1>0) { @@ -181,7 +181,7 @@ static void hexdump(void *pos, int len) { } len--; } - fputs("\n", stderr); + fputs("\n", stderr); } fputc('\n', stderr); } @@ -242,7 +242,7 @@ ulong RV20toYUV420HiveMessage(ulong *p1,ulong p2) { memset(h_temp,0x77,1000); memcpy(h_temp,p1,4); fprintf(stderr,"COPY OK!\n"); - + // tic(); // result=(*rvyuvHiveMessage)(p1,p2); result=(*rvyuvHiveMessage)(h_temp,p2); @@ -256,7 +256,7 @@ ulong RV20toYUV420HiveMessage(ulong *p1,ulong p2) { // p1[0]=0; // p1[1]=0x20000000; - + fprintf(stderr,">4; while(lines--) { int len1=len, i; - fprintf(stderr, "#R# %0x ", (int)cpos-(int)pos); + fprintf(stderr, "#R# %0x ", (int)cpos-(int)pos); cpos1=cpos; for (i=0;i<16;i++) { if (len1>0) { @@ -153,7 +153,7 @@ static void hexdump(void *pos, int len) { } len--; } - fputs("\n", stderr); + fputs("\n", stderr); } fputc('\n', stderr); } @@ -214,7 +214,7 @@ ulong RV20toYUV420HiveMessage(ulong *p1,ulong p2) { memset(h_temp,0x77,1000); memcpy(h_temp,p1,4); fprintf(stderr,"COPY OK!\n"); - + // tic(); // result=(*rvyuvHiveMessage)(p1,p2); result=(*rvyuvHiveMessage)(h_temp,p2); @@ -228,7 +228,7 @@ ulong RV20toYUV420HiveMessage(ulong *p1,ulong p2) { // p1[0]=0; // p1[1]=0x20000000; - + fprintf(stderr,">4; while(lines--) { int len1=len, i; - fprintf(stderr, "%0x ", cpos); + fprintf(stderr, "%0x ", cpos); cpos1=cpos; for (i=0;i<16;i++) { if (len1>0) { @@ -203,7 +203,7 @@ void hexdump(void *pos, int len) { } len--; } - fputs("\n", stderr); + fputs("\n", stderr); } fputc('\n', stderr); } @@ -380,7 +380,7 @@ ulong RASetFlavor(ulong p1,ulong p2) { } fputs("######################## FLAVOR PROPERTIES ###################\n\n", stderr); -*/ +*/ return result; } diff --git a/TOOLS/realcodecs/rv30.c b/TOOLS/realcodecs/rv30.c index a74f2e22ab..41f49eadaa 100644 --- a/TOOLS/realcodecs/rv30.c +++ b/TOOLS/realcodecs/rv30.c @@ -212,7 +212,7 @@ void hexdump(void *pos, int len) { int lines=(len+15)>>4; while(lines--) { int len1=len, i; - fprintf(stderr, "%0x ", cpos); + fprintf(stderr, "%0x ", cpos); cpos1=cpos; for (i=0;i<16;i++) { if (len1>0) { @@ -232,7 +232,7 @@ void hexdump(void *pos, int len) { } len--; } - fputs("\n", stderr); + fputs("\n", stderr); } fputc('\n', stderr); } diff --git a/TOOLS/realcodecs/sipr.c b/TOOLS/realcodecs/sipr.c index d14996aa2e..9a3399ea6c 100644 --- a/TOOLS/realcodecs/sipr.c +++ b/TOOLS/realcodecs/sipr.c @@ -206,7 +206,7 @@ void hexdump(void *pos, int len) { int lines=(len+15)>>4; while(lines--) { int len1=len, i; - fprintf(stderr, "%0x ", cpos); + fprintf(stderr, "%0x ", cpos); cpos1=cpos; for (i=0;i<16;i++) { if (len1>0) { @@ -226,7 +226,7 @@ void hexdump(void *pos, int len) { } len--; } - fputs("\n", stderr); + fputs("\n", stderr); } fputc('\n', stderr); } @@ -246,7 +246,7 @@ static int pkno=0; ulong RADecode(ulong p1,ulong p2,ulong p3,ulong p4,ulong* p5,ulong p6) { ulong result; int x,y; - + fprintf(stderr, "RADecode(ulong ctx=0x%0lx, ", p1); fprintf(stderr, "ulong src=0x%0lx,\n", p2); fprintf(stderr, "ulong len=0x%0lx,", p3); @@ -375,7 +375,7 @@ ulong RAInitDecoder(ulong p1,ulong p2) { memset(temp2,0x77,256); memcpy(temp2,temp[6],16); temp[6]=temp2; - + result=(*raInitDecoder)(p1,temp); hexdump((void*)temp[6], 32); #endif @@ -445,7 +445,7 @@ ulong RASetFlavor(ulong p1,ulong p2,ulong p3) { fputs("######################## FLAVOR PROPERTIES ###################\n\n", stderr); #endif - + return result; } diff --git a/TOOLS/subrip.c b/TOOLS/subrip.c index edcd811816..7cb15f6223 100644 --- a/TOOLS/subrip.c +++ b/TOOLS/subrip.c @@ -210,7 +210,7 @@ main(int argc, char **argv) spudec_assemble(spudec, packet, packet_len, pts100); if (spudec->queue_head) { spudec_heartbeat(spudec, spudec->queue_head->start_pts); - if (spudec_changed(spudec)) + if (spudec_changed(spudec)) spudec_draw(spudec, draw_alpha); } } diff --git a/TOOLS/vivodump.c b/TOOLS/vivodump.c index a89cb3da2a..8ee0915099 100644 --- a/TOOLS/vivodump.c +++ b/TOOLS/vivodump.c @@ -66,9 +66,9 @@ int height=240; static int h263_decode_picture_header(unsigned char *b_ptr) { int i; - + for(i=0;i<16;i++) printf(" %02X",b_ptr[i]); printf("\n"); - + buffer=b_ptr; bufptr=bitcnt=buf=0; @@ -193,8 +193,8 @@ mux=muxer_new_stream(avi,MUXER_TYPE_VIDEO); mux->buffer_size=0x200000; mux->buffer=malloc(mux->buffer_size); -mux->h.dwScale=1; -mux->h.dwRate=10; +mux->h.dwScale=1; +mux->h.dwRate=10; mux->bih=malloc(sizeof(BITMAPINFOHEADER)); mux->bih->biSize=sizeof(BITMAPINFOHEADER); @@ -256,7 +256,7 @@ while((c=fgetc(f))>=0){ h263_decode_picture_header(mux->buffer); muxer_write_chunk(mux,mux->buffer_len,0x10, MP_NOPTS_VALUE, MP_NOPTS_VALUE); mux->buffer_len=0; - + if((v_id&0xF0)==0x10) fprintf(stderr,"hmm. last video packet %02X\n",v_id); } flag2=0; diff --git a/TOOLS/vobshift.py b/TOOLS/vobshift.py index 180b5c486f..c2d36b2e8d 100755 --- a/TOOLS/vobshift.py +++ b/TOOLS/vobshift.py @@ -1,6 +1,6 @@ #!/usr/bin/env python -#usage: +#usage: # # vobshift.py in.idx out.idx -8.45 # @@ -35,7 +35,7 @@ def delta2text(d): def shift(line,seconds): triplet = tripletize(line) - + base = text2delta(triplet[1]) base = base + datetime.timedelta(seconds=seconds) base = delta2text(base) @@ -52,7 +52,7 @@ o = open(OUTFILE,'wt') for line in open(INFILE): if line.startswith('timestamp'): line = shift(line,DIFF) - + o.write(line) o.close() diff --git a/TOOLS/w32codec_dl.pl b/TOOLS/w32codec_dl.pl index 2dfe46df23..41f4f9feca 100755 --- a/TOOLS/w32codec_dl.pl +++ b/TOOLS/w32codec_dl.pl @@ -33,7 +33,7 @@ CC: while () next CC if (m/^[ \t]*\;/); s/\;.*//g; s/#.*//g; - + if (m/^videocodec (.*)/) { $codec = $1; @@ -105,17 +105,17 @@ close CODEC_CABS; sub find_codec { my ($fourcc) = @_; - + my $guid = sprintf ("%08X", unpack ("V", $fourcc))."-0000-0010-8000-00AA00389B71"; - + my $req = HTTP::Request->new (POST => "http://activex.microsoft.com/objects/ocget.dll"); $req->header ('Accept', '*/*'); $req->content_type ('application/x-www-form-urlencoded'); $req->content ("CLSID=%7B${guid}%7D\n"); #$req->content ('CLSID={'.${guid}.'}'); - + my $res = $ua->request ($req); - + if ($res->is_success) { print "Lookup returned success... weird!\n"; return 1; @@ -147,17 +147,17 @@ sub find_codec sub get_codec { my ($url) = @_; - + my $req = HTTP::Request->new (GET => $url); $req->header ("Accept", "*/*"); my $res = $ua->request ($req); - + if ($res->is_success) { open TMP, ">tmp.cab" or die "Unable to open tmp.cab"; print TMP $res->content; close TMP; - + system "cabextract tmp.cab"; unlink "tmp.cab"; } -- cgit v1.2.3