diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-04-28 03:58:36 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-04-28 12:15:18 +0300 |
| commit | 2faffe2a7f4076beb461c34428d42b13e0414283 (patch) | |
| tree | 3b7a3ea0d74a4e92f1310ace9ef60663d0eed20b /configure | |
| parent | 38d50e936919cbe03264c8c03fe40fc3af87d95c (diff) | |
| parent | ae09115f2b50e5c5d82383803dbfb25eb8f2e137 (diff) | |
| download | mpv-2faffe2a7f4076beb461c34428d42b13e0414283.tar.bz2 mpv-2faffe2a7f4076beb461c34428d42b13e0414283.tar.xz | |
Merge svn changes up to r26555
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -6316,11 +6316,13 @@ echores "$_real" echocheck "QuickTime codecs" _qtx_emulation=no +_def_qtx_win32='#undef USE_QTX_CODECS_WIN32' if test "$_qtx" = auto ; then test "$_win32dll" = yes || darwin && _qtx=yes fi if test "$_qtx" = yes ; then _def_qtx='#define USE_QTX_CODECS 1' + win32 && _qtx_codecs_win32=yes && _def_qtx_win32='#define USE_QTX_CODECS_WIN32 1' _codecmodules="qtx $_codecmodules" darwin || win32 || _qtx_emulation=yes else @@ -7788,6 +7790,7 @@ DVDNAV = $_dvdnav WIN32DLL = $_win32dll WIN32_EMULATION = $_win32_emulation QTX_CODECS = $_qtx +QTX_CODECS_WIN32 = $_qtx_codecs_win32 QTX_EMULATION = $_qtx_emulation REAL_CODECS = $_real XANIM_CODECS = $_xanim @@ -8567,6 +8570,7 @@ $_def_joystick /* enables / disables QTX codecs */ $_def_qtx +$_def_qtx_win32 /* enables / disables osd menu */ $_def_menu |