Mercurial > mplayer.hg

comparison configure @ 23693:4212a3701eff

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Sync FFmpeg changes: CONFIG_X264 --> CONFIG_LIBX264, CONFIG_XVID --> CONFIG_LIBXVID
author diego
date Tue, 03 Jul 2007 09:14:47 +0000
parents 3454aed9d083
children 226cbc96133d
comparison
equal deleted inserted replaced
23692:4566261f75de 23693:4212a3701eff
6363 #include <xvid.h> 6363 #include <xvid.h>
6364 int main(void) { xvid_plugin_2pass2_t s; s.vbv_size=0; return 0; } 6364 int main(void) { xvid_plugin_2pass2_t s; s.vbv_size=0; return 0; }
6365 EOF 6365 EOF
6366 if cc_check ; then 6366 if cc_check ; then
6367 _lavc_xvid=yes 6367 _lavc_xvid=yes
6368 _def_lavc_xvid='#define CONFIG_XVID 1' 6368 _def_lavc_xvid='#define CONFIG_LIBXVID 1'
6369 else 6369 else
6370 _lavc_xvid=no 6370 _lavc_xvid=no
6371 _def_lavc_xvid='#undef CONFIG_XVID' 6371 _def_lavc_xvid='#undef CONFIG_LIBXVID'
6372 fi 6372 fi
6373 echores "$_lavc_xvid" 6373 echores "$_lavc_xvid"
6374 fi 6374 fi
6375 6375
6376 6376
6394 _x264=yes 6394 _x264=yes
6395 _def_x264='#define HAVE_X264 1' 6395 _def_x264='#define HAVE_X264 1'
6396 _codecmodules="x264 $_codecmodules" 6396 _codecmodules="x264 $_codecmodules"
6397 if echo $_libavencoders | grep -q X264 ; then 6397 if echo $_libavencoders | grep -q X264 ; then
6398 _lavc_x264=yes 6398 _lavc_x264=yes
6399 _def_lavc_x264='#define CONFIG_X264 1' 6399 _def_lavc_x264='#define CONFIG_LIBX264 1'
6400 _libs_mplayer="$_libs_mplayer $_ld_x264" 6400 _libs_mplayer="$_libs_mplayer $_ld_x264"
6401 else 6401 else
6402 _lavc_x264=no 6402 _lavc_x264=no
6403 _def_lavc_x264='#undef CONFIG_X264' 6403 _def_lavc_x264='#undef CONFIG_LIBX264'
6404 fi 6404 fi
6405 else 6405 else
6406 _x264=no 6406 _x264=no
6407 _lavc_x264=no 6407 _lavc_x264=no
6408 _def_x264='#undef HAVE_X264' 6408 _def_x264='#undef HAVE_X264'
6409 _def_lavc_x264='#undef CONFIG_X264' 6409 _def_lavc_x264='#undef CONFIG_LIBX264'
6410 _nocodecmodules="x264 $_nocodecmodules" 6410 _nocodecmodules="x264 $_nocodecmodules"
6411 _libavencoders=`echo $_libavencoders | sed -e s/LIBX264_ENCODER// ` 6411 _libavencoders=`echo $_libavencoders | sed -e s/LIBX264_ENCODER// `
6412 fi 6412 fi
6413 echores "$_x264 (in libavcodec: $_lavc_x264)" 6413 echores "$_x264 (in libavcodec: $_lavc_x264)"
6414 6414