diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-06-07 19:57:57 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-06-07 19:57:57 +0300 |
| commit | af3fcdf2ded43e887bceed3a957b5cc4f7dbc2c6 (patch) | |
| tree | 2ead158ae6e6abfffcccf1609aa5492f9402e24f /libvo/osd.c | |
| parent | d5c868325cefcd5fad53361d1dfdc9757674eb70 (diff) | |
| parent | 4653f5ed7575d6070b54a88b4deb449f838825b3 (diff) | |
| download | mpv-af3fcdf2ded43e887bceed3a957b5cc4f7dbc2c6.tar.bz2 mpv-af3fcdf2ded43e887bceed3a957b5cc4f7dbc2c6.tar.xz | |
Merge svn changes up to r27025
Conflicts:
command.c
libvo/vosub_vidix.c
libvo/vosub_vidix.h
mplayer.c
Diffstat (limited to 'libvo/osd.c')
| -rw-r--r-- | libvo/osd.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libvo/osd.c b/libvo/osd.c index 9bf0cb2f9d..da7d61fb50 100644 --- a/libvo/osd.c +++ b/libvo/osd.c @@ -10,7 +10,6 @@ #include "mp_msg.h" #include <inttypes.h> #include "cpudetect.h" -#include "mangle.h" #ifdef ARCH_X86 #define CAN_COMPILE_X86_ASM |