Mercurial > mplayer.hg

changeset 26513:133c98f1c5a8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Only compile libmpcodecs/ve_qtvideo.c on Windows.
author diego
date Sat, 26 Apr 2008 10:53:32 +0000
parents a1dc4d5b5b40
children d6860e5b3ab8
files Makefile configure libmpcodecs/ve.c
diffstat 3 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Sat Apr 26 09:31:05 2008 +0000
+++ b/Makefile	Sat Apr 26 10:53:32 2008 +0000
@@ -520,7 +520,7 @@
 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
--- a/configure	Sat Apr 26 09:31:05 2008 +0000
+++ b/configure	Sat Apr 26 10:53:32 2008 +0000
@@ -6316,11 +6316,13 @@
 
 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 @@
 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 @@
 
 /* enables / disables QTX codecs */
 $_def_qtx
+$_def_qtx_win32
 
 /* enables / disables osd menu */
 $_def_menu
--- a/libmpcodecs/ve.c	Sat Apr 26 09:31:05 2008 +0000
+++ b/libmpcodecs/ve.c	Sat Apr 26 10:53:32 2008 +0000
@@ -28,7 +28,7 @@
 #endif
 #ifdef USE_WIN32DLL
     &ve_info_vfw,
-#ifdef USE_QTX_CODECS
+#ifdef USE_QTX_CODECS_WIN32
     &ve_info_qtvideo,
 #endif
 #endif