diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 00:13:11 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 00:13:11 +0200 |
| commit | 13221a716588dc88c1151e0a0f8eb7cce41d461c (patch) | |
| tree | 3184184f1e984d248e2570ffa05c79589d2c9a1c /TOOLS | |
| parent | c4f7b9666f753b320157e6497f9114523878885f (diff) | |
| parent | bb54613ac1211c73a3614db6b7326d7cd9be39da (diff) | |
| download | mpv-13221a716588dc88c1151e0a0f8eb7cce41d461c.tar.bz2 mpv-13221a716588dc88c1151e0a0f8eb7cce41d461c.tar.xz | |
Merge svn changes up to r30663
Conflicts:
gui/cfg.c
libmpcodecs/vd_dmo.c
mplayer.c
Diffstat (limited to 'TOOLS')
| -rw-r--r-- | TOOLS/realcodecs/cook.c | 2 | ||||
| -rw-r--r-- | TOOLS/realcodecs/drv2.c | 2 | ||||
| -rw-r--r-- | TOOLS/realcodecs/drv3.c | 2 | ||||
| -rw-r--r-- | TOOLS/realcodecs/sipr.c | 2 |
4 files changed, 0 insertions, 8 deletions
diff --git a/TOOLS/realcodecs/cook.c b/TOOLS/realcodecs/cook.c index ede9a33aca..2e22e7fcf7 100644 --- a/TOOLS/realcodecs/cook.c +++ b/TOOLS/realcodecs/cook.c @@ -395,7 +395,6 @@ ulong RASetFlavor(ulong p1,ulong p2) { result=(*raSetFlavor)(p1,p2); fprintf(stderr, "--> 0x%0lx(%ld)\n\n\n", result, result); -#if 1 fputs("######################## FLAVOR PROPERTIES ###################\n\n", stderr); numflavors=raGetNumberOfFlavors2(); flavor=0; @@ -413,7 +412,6 @@ 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 278188afea..e93b4f2e8f 100644 --- a/TOOLS/realcodecs/drv2.c +++ b/TOOLS/realcodecs/drv2.c @@ -205,12 +205,10 @@ ulong RV20toYUV420CustomMessage(ulong* p1,ulong p2) { */ if(p1[0]==0x24){ -#if 1 hexdump(p1[2],64); memset(temp,0x77,16*4); memcpy(temp,p1[2],16); p1[2]=temp; -#endif } else { switch(p1[0]){ case 17: diff --git a/TOOLS/realcodecs/drv3.c b/TOOLS/realcodecs/drv3.c index 25556d4f42..38639c277b 100644 --- a/TOOLS/realcodecs/drv3.c +++ b/TOOLS/realcodecs/drv3.c @@ -192,7 +192,6 @@ ulong RV20toYUV420CustomMessage(ulong* p1,ulong p2) { // ulong *pp1=p1; ulong temp[16]; fprintf(stderr, "#R# => RV20toYUV420CustomMessage(%p,%p) [%ld,%ld,%ld] \n", p1, p2, p1[0],p1[1],p1[2]); -#if 1 if(p1[0]==0x24){ hexdump(p1[2],16); memset(temp,0x77,16*4); @@ -201,7 +200,6 @@ ulong RV20toYUV420CustomMessage(ulong* p1,ulong p2) { } else { return 0; } -#endif // fprintf(stderr, "ulong p2=0x%0lx(%ld))\n", p2, p2); // hexdump((void*)p1, 12); diff --git a/TOOLS/realcodecs/sipr.c b/TOOLS/realcodecs/sipr.c index 43e0805b2e..ee04f0b082 100644 --- a/TOOLS/realcodecs/sipr.c +++ b/TOOLS/realcodecs/sipr.c @@ -426,7 +426,6 @@ ulong RASetFlavor(ulong p1,ulong p2,ulong p3) { result=(*raSetFlavor)(p1,p2,p3); fprintf(stderr, "--> 0x%0lx(%ld)\n\n\n", result, result); -#if 1 fputs("######################## FLAVOR PROPERTIES ###################\n\n", stderr); numflavors=3;//raGetNumberOfFlavors(); flavor=0; @@ -444,7 +443,6 @@ ulong RASetFlavor(ulong p1,ulong p2,ulong p3) { } fputs("######################## FLAVOR PROPERTIES ###################\n\n", stderr); -#endif return result; } |