Mercurial > mplayer.hg

comparison configure @ 35319:ba51b077d042

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Set CONFIG_LIBXVID up properly.
author reimar
date Sat, 10 Nov 2012 15:01:48 +0000
parents 0f09dd8843bf
children 2ea8746871f2
comparison
equal deleted inserted replaced
35318:249053c3da2b 35319:ba51b077d042
7045 if test "$_mencoder" = yes && test "$_xvid" = yes && test "$_xvid_lavc" = auto ; then 7045 if test "$_mencoder" = yes && test "$_xvid" = yes && test "$_xvid_lavc" = auto ; then
7046 statement_check xvid.h 'xvid_plugin_2pass2_t s; s.vbv_size = 0' && _xvid_lavc=yes 7046 statement_check xvid.h 'xvid_plugin_2pass2_t s; s.vbv_size = 0' && _xvid_lavc=yes
7047 fi 7047 fi
7048 if test "$_xvid_lavc" = yes ; then 7048 if test "$_xvid_lavc" = yes ; then
7049 def_xvid_lavc='#define CONFIG_LIBXVID 1' 7049 def_xvid_lavc='#define CONFIG_LIBXVID 1'
7050 libavencoders="$libavencoders LIBXVID LIBXVID_ENCODER" 7050 libavencoders="$libavencoders LIBXVID_ENCODER"
7051 else 7051 else
7052 _xvid_lavc=no 7052 _xvid_lavc=no
7053 def_xvid_lavc='#define CONFIG_LIBXVID 0' 7053 def_xvid_lavc='#define CONFIG_LIBXVID 0'
7054 fi 7054 fi
7055 echores "$_xvid_lavc" 7055 echores "$_xvid_lavc"
8448 HAVE_PTHREADS = $_pthreads 8448 HAVE_PTHREADS = $_pthreads
8449 HAVE_SHM = $_shm 8449 HAVE_SHM = $_shm
8450 HAVE_W32THREADS = $_w32threads 8450 HAVE_W32THREADS = $_w32threads
8451 HAVE_YASM = $have_yasm 8451 HAVE_YASM = $have_yasm
8452 8452
8453 CONFIG_LIBXVID = $_xvid_lavc
8453 $(mak_enable "$libavdecoders_all" "$libavdecoders" CONFIG) 8454 $(mak_enable "$libavdecoders_all" "$libavdecoders" CONFIG)
8454 $(mak_enable "$libavencoders_all" "$libavencoders" CONFIG) 8455 $(mak_enable "$libavencoders_all" "$libavencoders" CONFIG)
8455 $(mak_enable "$libavparsers_all" "$libavparsers" CONFIG) 8456 $(mak_enable "$libavparsers_all" "$libavparsers" CONFIG)
8456 $(mak_enable "$libavdemuxers_all" "$libavdemuxers" CONFIG) 8457 $(mak_enable "$libavdemuxers_all" "$libavdemuxers" CONFIG)
8457 $(mak_enable "$libavmuxers_all" "$libavmuxers" CONFIG) 8458 $(mak_enable "$libavmuxers_all" "$libavmuxers" CONFIG)