[MPlayer-cvslog] CVS: main configure,1.1146,1.1147

[Corey Hickey CVS]

CVS change done by Corey Hickey CVS

Update of /cvsroot/mplayer/main
In directory mail:/var2/tmp/cvs-serv22047

Modified Files:
	configure 
Log Message:
Support libavcodec vrc_strategy=1 (XviD ratecontrol).
As a side effect, this also makes -lavcopts vcodec=xvid work.


Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.1146
retrieving revision 1.1147
diff -u -r1.1146 -r1.1147
--- configure	16 Mar 2006 21:56:22 -0000	1.1146
+++ configure	17 Mar 2006 23:47:10 -0000	1.1147
@@ -6348,6 +6348,7 @@
 int main(void) { xvid_init(0, 0, 0, 0); return 0; }
 EOF
 _ld_xvid="$_ld_xvid -lxvidcore"
+_xvid4=no
 if test "$_xvid" != no && cc_check $_inc_xvid $_ld_xvid $_ld_lm ; then
   _xvid=yes
   _def_xvid3='#define HAVE_XVID3 1'
@@ -6360,8 +6361,10 @@
 EOF
   if test "$_xvid" != no && cc_check $_inc_xvid $_ld_xvid $_ld_lm ; then
     _xvid=yes
+    _xvid4=yes
     _def_xvid3='#undef HAVE_XVID3'
     _def_xvid4='#define HAVE_XVID4 1'
+    _def_lavc_xvid='#define CONFIG_XVID 1'
     _codecmodules="xvid $_codecmodules"
   else
     _xvid=no
@@ -7384,6 +7387,7 @@
 AMR_WB=$_amr_wb
 `echo $_libavcodecs | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/'`
 CONFIG_FAAC=$_faac
+CONFIG_XVID=$_xvid4
 CONFIG_GPL=yes
 CONFIG_MUXERS=yes
 
@@ -7750,6 +7754,7 @@
 /* Use specific codecs from libavcodec */
 `echo $_libavcodecs | tr '[a-z] ' '[A-Z]\n' | sed 's/^/#define CONFIG_/;s/$/ 1/'`
 $_def_lavc_faac
+$_def_lavc_xvid
 
 /* Use codec libs included in mplayer CVS / source dist: */
 $_def_mp3lib