[MPlayer-cvslog] r26545 - in trunk: Makefile configure libmpcodecs/ve.c

[diego]

Author: diego
Date: Sat Apr 26 12:53:32 2008
New Revision: 26545

Log:
Only compile libmpcodecs/ve_qtvideo.c on Windows.


Modified:
   trunk/Makefile
   trunk/configure
   trunk/libmpcodecs/ve.c

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	(original)
+++ trunk/Makefile	Sat Apr 26 12:53:32 2008
@@ -520,7 +520,7 @@ SRCS_MENCODER-$(LIBAVFORMAT)      += lib
 SRCS_MENCODER-$(LIBDV)            += libmpcodecs/ve_libdv.c
 SRCS_MENCODER-$(LIBLZO)           += libmpcodecs/ve_nuv.c
 SRCS_MENCODER-$(MP3LAME)          += libmpcodecs/ae_lame.c
-SRCS_MENCODER-$(QTX_CODECS)       += libmpcodecs/ve_qtvideo.c
+SRCS_MENCODER-$(QTX_CODECS_WIN32) += libmpcodecs/ve_qtvideo.c
 SRCS_MENCODER-$(TOOLAME)          += libmpcodecs/ae_toolame.c
 SRCS_MENCODER-$(TWOLAME)          += libmpcodecs/ae_twolame.c
 SRCS_MENCODER-$(WIN32DLL)         += libmpcodecs/ve_vfw.c

Modified: trunk/configure
==============================================================================
--- trunk/configure	(original)
+++ trunk/configure	Sat Apr 26 12:53:32 2008
@@ -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
@@ -7789,6 +7791,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
@@ -8568,6 +8571,7 @@ $_def_joystick
 
 /* enables / disables QTX codecs */
 $_def_qtx
+$_def_qtx_win32
 
 /* enables / disables osd menu */
 $_def_menu

Modified: trunk/libmpcodecs/ve.c
==============================================================================
--- trunk/libmpcodecs/ve.c	(original)
+++ trunk/libmpcodecs/ve.c	Sat Apr 26 12:53:32 2008
@@ -28,7 +28,7 @@ static vf_info_t* encoder_list[]={
 #endif
 #ifdef USE_WIN32DLL
     &ve_info_vfw,
-#ifdef USE_QTX_CODECS
+#ifdef USE_QTX_CODECS_WIN32
     &ve_info_qtvideo,
 #endif
 #endif