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