mirror of
https://github.com/mpv-player/mpv
synced 2025-03-11 08:37:59 +00:00
Sync FFmpeg changes:
CONFIG_X264 --> CONFIG_LIBX264, CONFIG_XVID --> CONFIG_LIBXVID git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23713 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
f4e02c38cb
commit
c06768bd4e
10
configure
vendored
10
configure
vendored
@ -6365,10 +6365,10 @@ int main(void) { xvid_plugin_2pass2_t s; s.vbv_size=0; return 0; }
|
||||
EOF
|
||||
if cc_check ; then
|
||||
_lavc_xvid=yes
|
||||
_def_lavc_xvid='#define CONFIG_XVID 1'
|
||||
_def_lavc_xvid='#define CONFIG_LIBXVID 1'
|
||||
else
|
||||
_lavc_xvid=no
|
||||
_def_lavc_xvid='#undef CONFIG_XVID'
|
||||
_def_lavc_xvid='#undef CONFIG_LIBXVID'
|
||||
fi
|
||||
echores "$_lavc_xvid"
|
||||
fi
|
||||
@ -6396,17 +6396,17 @@ if test "$_x264" = yes ; then
|
||||
_codecmodules="x264 $_codecmodules"
|
||||
if echo $_libavencoders | grep -q X264 ; then
|
||||
_lavc_x264=yes
|
||||
_def_lavc_x264='#define CONFIG_X264 1'
|
||||
_def_lavc_x264='#define CONFIG_LIBX264 1'
|
||||
_libs_mplayer="$_libs_mplayer $_ld_x264"
|
||||
else
|
||||
_lavc_x264=no
|
||||
_def_lavc_x264='#undef CONFIG_X264'
|
||||
_def_lavc_x264='#undef CONFIG_LIBX264'
|
||||
fi
|
||||
else
|
||||
_x264=no
|
||||
_lavc_x264=no
|
||||
_def_x264='#undef HAVE_X264'
|
||||
_def_lavc_x264='#undef CONFIG_X264'
|
||||
_def_lavc_x264='#undef CONFIG_LIBX264'
|
||||
_nocodecmodules="x264 $_nocodecmodules"
|
||||
_libavencoders=`echo $_libavencoders | sed -e s/LIBX264_ENCODER// `
|
||||
fi
|
||||
|
Loading…
Reference in New Issue
Block a user