github/mpv
1
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-01-16 22:37:28 +01:00
Code Releases Activity

Disable linking mplayer (and internal static libavcodec) with

Browse Source 
libmp3lame/faac/x264 if --disable-encoder=mp3lame/faac/x264
options are passed to configure.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20827 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
rathann 2006-11-09 23:14:33 +00:00
parent d7e32a0e84
commit 866ba3f296
2 changed files with 30 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -310,7 +310,7 @@ mplayer$(EXESUF): $(MPLAYER_DEP)
ifeq ($(MENCODER),yes)
LIBS_MENCODER = libmpcodecs/libmpencoders.a \
$(MP3LAME_LIB) \
$(EXTRA_LIB_MENCODER) \
$(COMMON_LIBS) \
mencoder$(EXESUF): $(MENCODER_DEP)

37
configure vendored
View File

@ -5816,13 +5816,19 @@ EOF
fi
if test "$_faac" = yes ; then
_def_faac="#define HAVE_FAAC 1"
_def_lavc_faac="#define CONFIG_FAAC 1"
if echo $_libavencoders | grep -q faac ; then
_lavc_faac=yes
_def_lavc_faac="#define CONFIG_FAAC 1"
else
_lavc_faac=no
_def_lavc_faac="#undef CONFIG_FAAC"
fi
_codecmodules="faac $_codecmodules"
else
_def_faac="#undef HAVE_FAAC"
_nocodecmodules="faac $_nocodecmodules"
fi
echores "$_faac"
echores "$_faac (in libavcodec: $_lavc_faac)"
echocheck "FAAD2 (AAC) support"
@ -6487,16 +6493,23 @@ fi
if test "$_x264" = yes ; then
_x264=yes
_def_x264='#define HAVE_X264 1'
_def_lavc_x264='#define CONFIG_X264 1'
_codecmodules="x264 $_codecmodules"
if echo $_libavencoders | grep -q x264 ; then
_lavc_x264=yes
_def_lavc_x264='#define CONFIG_X264 1'
else
_lavc_x264=no
_def_lavc_x264='#undef CONFIG_X264'
fi
else
_x264=no
_ld_x264=''
_lavc_x264=no
_def_x264='#undef HAVE_X264'
_def_lavc_x264='#undef CONFIG_X264'
_nocodecmodules="x264 $_nocodecmodules"
fi
echores "$_x264"
echores "$_x264 (in libavcodec: $_lavc_x264)"
echocheck "nut"
@ -7397,17 +7410,25 @@ EXTRA_LIB = $_ld_extra $_ld_live $_ld_vstream $_ld_network $_ld_enca \
$_ld_static $_ld_zlib $_ld_termcap $_ld_lirc $_ld_lircc $_ld_win32 \
$_ld_win32libs $_ld_lm $_ld_libC $_ld_fribidi $_ld_smb $_ld_gif \
$_ld_libcdio $_ld_dvdread $_ld_dvdnav $_macosx_frameworks $_ld_cdparanoia \
$_ld_xvid $_ld_x264 $_ld_mp3lame $_ld_libdts $_ld_mad \
$_ld_xvid $_ld_libdts $_ld_mad \
$_ld_vorbis $_ld_libdv $_ld_theora $_ld_faad $_ld_speex $_xmms_lib \
$_toolame_lib $_twolame_lib $_ld_faac $_ld_musepack $_ld_liblzo $_ld_png \
$_ld_musepack $_ld_liblzo $_ld_png \
$_ld_jpeg $_ld_alsa $_ld_nut $_ld_arch $_ld_iconv $_ld_mlib
VO_LIBS = $_ld_aa $_ld_sdl $_ld_ggi $_ld_svga $_ld_directfb $_ld_caca \
$_ld_vesa $_ld_vidix_external $_ld_gl $_ld_dga $_ld_xv $_ld_xvmc $_ld_vm \
$_ld_xinerama $_ld_x11 $_ld_sock
AO_LIBS = $_ld_arts $_ld_esd $_ld_jack $_ld_openal $_ld_nas $_ld_sgiaudio \
$_ld_polyp
ENCORE_LIB = $_ld_mp3lame
LAVC_MP3LAME = $_lavc_mp3lame
EXTRA_LIB_MENCODER = $_ld_mp3lame $_ld_x264 $_toolame_lib $_twolame_lib $_ld_faac
ifeq ($_lavc_faac,yes)
EXTRA_LIB += $_ld_faac
endif
ifeq ($_lavc_mp3lame,yes)
EXTRA_LIB += $_ld_mp3lame
endif
ifeq ($_lavc_x264,yes)
EXTRA_LIB += $_ld_x264
endif
FREETYPE_LIB = $_ld_freetype
FONTCONFIG_LIB = $_ld_fontconfig
GTK_LIBS = $_ld_static $_ld_gtk $_ld_glib