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

Fix linking when libavcodec uses x264.

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21132 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
diego 2006-11-21 15:12:55 +00:00
parent 196ec9d95f
commit ce672fbf1b
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
configure vendored
View File

@ -6420,8 +6420,8 @@ if test "$_x264" = auto ; then
int main(void) { x264_encoder_open((void*)0); return 0; }
EOF
_x264=no
for _ld_tmp in "-lx264 $_ld_pthread" "-lx264 $_ld_pthread $_ld_x11 $_ld_lm" ; do
cc_check $_ld_tmp && _libs_mencoder="$_libs_mencoder $_ld_tmp" && _x264=yes && break
for _ld_x264 in "-lx264 $_ld_pthread" "-lx264 $_ld_pthread $_ld_x11 $_ld_lm" ; do
cc_check $_ld_tmp && _libs_mencoder="$_libs_mencoder $_ld_x264" && _x264=yes && break
done
fi
@ -6432,6 +6432,7 @@ if test "$_x264" = yes ; then
if echo $_libavencoders | grep -q x264 ; then
_lavc_x264=yes
_def_lavc_x264='#define CONFIG_X264 1'
_libs_mplayer="$_libs_mplayer $_ld_x264"
else
_lavc_x264=no
_def_lavc_x264='#undef CONFIG_X264'
@ -7365,9 +7366,6 @@ 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