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/realcodecs/sipr.c | |
| 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/realcodecs/sipr.c')
| -rw-r--r-- | TOOLS/realcodecs/sipr.c | 2 |
1 files changed, 0 insertions, 2 deletions
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; } |