Mercurial > mplayer.hg

comparison configure @ 26646:f467dcaeeb26

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Always enable x264 in libavcodec if x264 is enabled.
author diego
date Tue, 06 May 2008 22:56:42 +0000
parents d3ce3939637a
children 93f5b123644a
comparison
equal deleted inserted replaced
26645:1b9a15fe49e2 26646:f467dcaeeb26
6577 fi 6577 fi
6578 6578
6579 if test "$_x264" = yes ; then 6579 if test "$_x264" = yes ; then
6580 _def_x264='#define HAVE_X264 1' 6580 _def_x264='#define HAVE_X264 1'
6581 _codecmodules="x264 $_codecmodules" 6581 _codecmodules="x264 $_codecmodules"
6582 if echo $_libavencoders | grep -q X264 ; then
6583 _lavc_x264=yes
6584 _def_lavc_x264='#define CONFIG_LIBX264 1' 6582 _def_lavc_x264='#define CONFIG_LIBX264 1'
6585 _libs_mplayer="$_libs_mplayer $_ld_x264" 6583 _libs_mplayer="$_libs_mplayer $_ld_x264"
6586 _libavencoders="$_libavencoders LIBX264_ENCODER" 6584 _libavencoders="$_libavencoders LIBX264_ENCODER"
6587 else 6585 else
6588 _lavc_x264=no
6589 _def_lavc_x264='#undef CONFIG_LIBX264'
6590 fi
6591 else
6592 _lavc_x264=no
6593 _def_x264='#undef HAVE_X264' 6586 _def_x264='#undef HAVE_X264'
6594 _def_lavc_x264='#undef CONFIG_LIBX264' 6587 _def_lavc_x264='#undef CONFIG_LIBX264'
6595 _nocodecmodules="x264 $_nocodecmodules" 6588 _nocodecmodules="x264 $_nocodecmodules"
6596 fi 6589 fi
6597 echores "$_x264 (in libavcodec: $_lavc_x264)" 6590 echores "$_x264 (in libavcodec: $_lavc_x264)"
7766 CONFIG_LIBAMR_NB=$_libamr_nb 7759 CONFIG_LIBAMR_NB=$_libamr_nb
7767 CONFIG_LIBAMR_WB=$_libamr_wb 7760 CONFIG_LIBAMR_WB=$_libamr_wb
7768 CONFIG_LIBFAAC=$_lavc_faac 7761 CONFIG_LIBFAAC=$_lavc_faac
7769 CONFIG_LIBMP3LAME=$_lavc_mp3lame 7762 CONFIG_LIBMP3LAME=$_lavc_mp3lame
7770 CONFIG_LIBVORBIS=$_libvorbis 7763 CONFIG_LIBVORBIS=$_libvorbis
7771 CONFIG_LIBX264=$_lavc_x264 7764 CONFIG_LIBX264=$_x264
7772 CONFIG_LIBXVID=$_lavc_xvid 7765 CONFIG_LIBXVID=$_lavc_xvid
7773 CONFIG_MLIB = $_mlib 7766 CONFIG_MLIB = $_mlib
7774 # Prevent building libavcodec/imgresample.c with conflicting symbols 7767 # Prevent building libavcodec/imgresample.c with conflicting symbols
7775 CONFIG_SWSCALE=yes 7768 CONFIG_SWSCALE=yes
7776 CONFIG_ZLIB=$_zlib 7769 CONFIG_ZLIB=$_zlib