diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rwxr-xr-x | configure | 67 | ||||
| -rw-r--r-- | libmpcodecs/Makefile | 10 | ||||
| -rw-r--r-- | libmpcodecs/ad.c | 2 | ||||
| -rw-r--r-- | libmpcodecs/ad_dmo.c | 3 | ||||
| -rw-r--r-- | libmpcodecs/ad_dshow.c | 3 | ||||
| -rw-r--r-- | libmpcodecs/vd.c | 2 | ||||
| -rw-r--r-- | libmpcodecs/vd_dmo.c | 3 | ||||
| -rw-r--r-- | libmpcodecs/vd_dshow.c | 3 |
9 files changed, 9 insertions, 86 deletions
@@ -108,7 +108,6 @@ CODEC_LIBS = $(AV_LIB) \ COMMON_LIBS = libmpcodecs/libmpcodecs.a \ $(W32_LIB) \ - $(DS_LIB) \ libaf/libaf.a \ libmpdemux/libmpdemux.a \ postproc/libswscale.a \ @@ -213,7 +212,6 @@ ALL_PRG += $(PRG_MENCODER) endif COMMON_DEPS = $(W32_DEP) \ - $(DS_DEP) \ $(MP1E_DEP) \ $(AV_DEP) \ libmpdemux/libmpdemux.a \ @@ -255,7 +255,6 @@ Codecs: --enable-libcdio enable external libcdio support [autodetect] --enable-liblzo enable external liblzo support [autodetect] --disable-win32 disable Win32 DLL support [autodetect] - --disable-dshow disable Win32/DirectShow support [autodetect] --disable-qtx disable Quicktime codecs [autodetect] --disable-xanim disable XAnim DLL support [autodetect] --disable-real disable RealPlayer DLL support [autodetect] @@ -1635,7 +1634,6 @@ _alsa=auto _fastmemcpy=yes _unrarlib=yes _win32=auto -_dshow=yes _select=yes _tv=yes _tv_v4l=auto @@ -2086,8 +2084,6 @@ for ac_option do --enable-win32) _win32=yes ;; --disable-win32) _win32=no ;; - --enable-dshow) _dshow=yes ;; - --disable-dshow) _dshow=no ;; --with-x11incdir=*) _inc_x11=-I`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -I,g'` @@ -5921,15 +5917,14 @@ if test "$_win32" = yes ; then else _def_win32='#undef USE_WIN32DLL' _nocodecmodules="win32 $_nocodecmodules" - _dshow=no fi echores "$_win32" if test "$_win32" != no ; then _def_win32_loader='#undef WIN32_LOADER' echocheck "Win32 loader support" - _ld_win32='loader/libloader.a' - _dep_win32='loader/libloader.a' + _ld_win32='loader/libloader.a loader/dshow/libDS_Filter.a loader/dmo/libDMO_Filter.a' + _dep_win32='loader/libloader.a loader/dshow/libDS_Filter.a loader/dmo/libDMO_Filter.a' _codecmodules="win32 $_codecmodules" if openbsd ; then x86 && _ld_win32="$_ld_win32 -li386" @@ -5943,58 +5938,6 @@ if test "$_win32" != no ; then echores "$_win32" fi - -echocheck "DirectShow" -if false ; then - -if test "$_dshow" != no ; then - _dshow=no - # check if compiler supports C++ and C++-libs are installed correctly - cat > "$TMPCPP" << EOF -#include <string> -class myclass { - private: int ret; - public: int myreturn(void); -}; -int myclass::myreturn(void) { ret = 0; return ret ; } -int main(void) { myclass myobject; return myobject.myreturn(); } -EOF - if cxx_check && tmp_run ; then - _dshow=yes - echores "yes (C++ is ok)" - else - echores "no" - cat << EOF - -Your C++ runtime environment is broken. - -Hints: Does $_cc support C++? Do you have you a C++ compiler installed? - Are the C++ libraries correctly installed? - Check for libstdc++ and in (/etc/)ld.so.conf. - -If you do not need DirectShow support, you can also use: - ./configure --disable-dshow <your-normal-configure-options> -to disable building the C++ based DirectShow code. - -EOF - die "$_cc's C++ is broken" - fi -fi - -fi # if false - -echores "$_dshow" - -if test "$_dshow" = yes ; then - _def_dshow='#define USE_DIRECTSHOW 1' - _ld_dshow='loader/dshow/libDS_Filter.a loader/dmo/libDMO_Filter.a' - _dep_dshow='loader/dshow/libDS_Filter.a loader/dmo/libDMO_Filter.a' - _codecmodules="dshow/dmo $_codecmodules" -else - _def_dshow='#undef USE_DIRECTSHOW' - _nocodecmodules="dshow/dmo $_nocodecmodules" -fi - fi #if x86 && not qnx @@ -7500,10 +7443,9 @@ DVDREAD_LIB = $_ld_dvdread DVDKIT2 = $_mpdvdkit DVDNAV_LIB = $_ld_dvdnav SDL_INC = $_inc_sdl +WIN32DLL = $_win32 W32_DEP = $_dep_win32 W32_LIB = $_ld_win32 -DS_DEP = $_dep_dshow -DS_LIB = $_ld_dshow AV_DEP = $_dep_libavcodec $_dep_libavformat $_dep_libavutil $_dep_libpostproc AV_LIB = $_ld_libavcodec $_ld_libavformat $_ld_libavutil $_ld_libpostproc CONFIG_LIBAVUTIL = $_libavutil @@ -7902,9 +7844,6 @@ $_def_odivx_postprocess $_def_win32 #define WIN32_PATH "$_win32libdir" -/* DirectShow support */ -$_def_dshow - /* Mac OS X specific features */ $_def_macosx $_def_macosx_finder_support diff --git a/libmpcodecs/Makefile b/libmpcodecs/Makefile index 331f6d7abe..c6b5ce7218 100644 --- a/libmpcodecs/Makefile +++ b/libmpcodecs/Makefile @@ -23,8 +23,6 @@ AUDIO_SRCS_NAT=ad_alaw.c \ ad_pcm.c \ AUDIO_SRCS_OPT=ad_acm.c \ - ad_dmo.c \ - ad_dshow.c \ ad_faad.c \ ad_libdv.c \ ad_libmad.c \ @@ -39,6 +37,9 @@ endif ifeq ($(CONFIG_LIBAVCODEC_SO),yes) AUDIO_SRCS_OPT+=ad_ffmpeg.c endif +ifeq ($(WIN32DLL),yes) +AUDIO_SRCS_OPT+=ad_dshow.c ad_dmo.c +endif AUDIO_SRCS=dec_audio.c \ ad.c \ @@ -58,8 +59,6 @@ VIDEO_SRCS_NAT=vd_hmblck.c \ vd_sgi.c \ VIDEO_SRCS_OPT=vd_divx4.c \ - vd_dmo.c \ - vd_dshow.c \ vd_libdv.c \ vd_odivx.c \ vd_qtvideo.c \ @@ -78,6 +77,9 @@ endif ifeq ($(CONFIG_LIBAVCODEC_SO),yes) VIDEO_SRCS_OPT+=vd_ffmpeg.c endif +ifeq ($(WIN32DLL),yes) +VIDEO_SRCS_OPT+=vd_dmo.c vd_dshow.c +endif VIDEO_SRCS=dec_video.c \ vd.c \ diff --git a/libmpcodecs/ad.c b/libmpcodecs/ad.c index 5cca0f9cc6..4fb4d3e231 100644 --- a/libmpcodecs/ad.c +++ b/libmpcodecs/ad.c @@ -64,10 +64,8 @@ ad_functions_t* mpcodecs_ad_drivers[] = &mpcodecs_ad_dk3adpcm, &mpcodecs_ad_msgsm, #ifdef USE_WIN32DLL -#ifdef USE_DIRECTSHOW &mpcodecs_ad_dshow, &mpcodecs_ad_dmo, -#endif &mpcodecs_ad_acm, &mpcodecs_ad_twin, #endif diff --git a/libmpcodecs/ad_dmo.c b/libmpcodecs/ad_dmo.c index a9053caa13..b8d7d9db28 100644 --- a/libmpcodecs/ad_dmo.c +++ b/libmpcodecs/ad_dmo.c @@ -6,8 +6,6 @@ #include "mp_msg.h" #include "help_mp.h" -#ifdef USE_DIRECTSHOW - #include "ad_internal.h" static ad_info_t info = @@ -101,4 +99,3 @@ static int decode_audio(sh_audio_t *sh_audio,unsigned char *buf,int minlen,int m // len=size_out; return size_out; } -#endif diff --git a/libmpcodecs/ad_dshow.c b/libmpcodecs/ad_dshow.c index 5e98928b57..d6bc08a795 100644 --- a/libmpcodecs/ad_dshow.c +++ b/libmpcodecs/ad_dshow.c @@ -6,8 +6,6 @@ #include "mp_msg.h" #include "help_mp.h" -#ifdef USE_DIRECTSHOW - #include "ad_internal.h" static ad_info_t info = @@ -97,4 +95,3 @@ static int decode_audio(sh_audio_t *sh_audio,unsigned char *buf,int minlen,int m // len=size_out; return size_out; } -#endif diff --git a/libmpcodecs/vd.c b/libmpcodecs/vd.c index 426fd05b09..8c11c4e015 100644 --- a/libmpcodecs/vd.c +++ b/libmpcodecs/vd.c @@ -62,10 +62,8 @@ vd_functions_t* mpcodecs_vd_drivers[] = { &mpcodecs_vd_theora, #endif #ifdef USE_WIN32DLL -#ifdef USE_DIRECTSHOW &mpcodecs_vd_dshow, &mpcodecs_vd_dmo, -#endif &mpcodecs_vd_vfw, &mpcodecs_vd_vfwex, #endif diff --git a/libmpcodecs/vd_dmo.c b/libmpcodecs/vd_dmo.c index 737c0e2374..22682675ca 100644 --- a/libmpcodecs/vd_dmo.c +++ b/libmpcodecs/vd_dmo.c @@ -3,7 +3,6 @@ #include <stdarg.h> #include "config.h" -#ifdef USE_DIRECTSHOW #include "mp_msg.h" #include "help_mp.h" @@ -85,5 +84,3 @@ static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags){ return mpi; } - -#endif diff --git a/libmpcodecs/vd_dshow.c b/libmpcodecs/vd_dshow.c index 6f0923636f..391c59fe94 100644 --- a/libmpcodecs/vd_dshow.c +++ b/libmpcodecs/vd_dshow.c @@ -3,7 +3,6 @@ #include <stdarg.h> #include "config.h" -#ifdef USE_DIRECTSHOW #include "mp_msg.h" #include "help_mp.h" @@ -114,5 +113,3 @@ static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags){ return mpi; } - -#endif |