From fe55d26666ef0b0e5756b87613c9ac9afb994ccf Mon Sep 17 00:00:00 2001 From: jkeil Date: Tue, 14 Aug 2001 18:28:56 +0000 Subject: Use USE_WIN32DLL define instead of ARCH_X86 to decide whether or not to compile Win32 DLL code into mplayer. Default for USE_WIN32DLL is enabled on x86 machines, disabled otherwise. Use of Win32 DLLs can be disabled on x86 using the --disable-win32 configure option. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1518 b3059339-0415-0410-9bf9-f77b7e298cf2 --- dec_video.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'dec_video.c') diff --git a/dec_video.c b/dec_video.c index f365aa70d7..7854dace3a 100644 --- a/dec_video.c +++ b/dec_video.c @@ -104,7 +104,6 @@ int get_video_quality_max(sh_video_t *sh_video){ void set_video_quality(sh_video_t *sh_video,int quality){ switch(sh_video->codec->driver){ -#ifdef ARCH_X86 #ifdef USE_DIRECTSHOW case VFM_DSHOW: { if(quality<0 || quality>4) quality=4; @@ -112,7 +111,6 @@ void set_video_quality(sh_video_t *sh_video,int quality){ } break; #endif -#endif #ifdef MPEG12_POSTPROC case VFM_MPEG: { if(quality<0 || quality>6) quality=6; @@ -147,7 +145,7 @@ unsigned int out_fmt=sh_video->codec->outfmt[sh_video->outfmtidx]; sh_video->our_out_buffer=NULL; switch(sh_video->codec->driver){ -#ifdef ARCH_X86 +#ifdef USE_WIN32DLL case VFM_VFW: { if(!init_video_codec(sh_video,0)) { // GUI_MSG( mplUnknowError ) @@ -213,13 +211,13 @@ switch(sh_video->codec->driver){ break; #endif } -#else /* !ARCH_X86 */ +#else /* !USE_WIN32DLL */ case VFM_VFW: case VFM_DSHOW: case VFM_VFWEX: - fprintf(stderr,"MPlayer does not support win32 codecs on non-x86 platforms!\n"); + fprintf(stderr,"Support for win32 codecs disabled, or unavailable on non-x86 platforms!\n"); return 0; -#endif /* !ARCH_X86 */ +#endif /* !USE_WIN32DLL */ case VFM_ODIVX: { // OpenDivX if(verbose) printf("OpenDivX video codec\n"); { DEC_PARAM dec_param; @@ -465,7 +463,7 @@ if(verbose>1){ break; } #endif -#ifdef ARCH_X86 +#ifdef USE_WIN32DLL case VFM_VFWEX: case VFM_VFW: { -- cgit v1.2.3