Mercurial > mplayer.hg

changeset 23741:5e70169314cb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Revert r23758: It broke -vf uspp and -vf mcdeint.
author cehoyos
date Wed, 11 Jul 2007 01:49:43 +0000
parents 4313ad18d816
children 93c871be0258
files configure
diffstat 1 files changed, 4 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/configure	Tue Jul 10 16:08:29 2007 +0000
+++ b/configure	Wed Jul 11 01:49:43 2007 +0000
@@ -6453,13 +6453,12 @@
 
 echocheck "mencoder"
 _mencoder_flag='#undef HAVE_MENCODER'
-_def_encoders='#undef CONFIG_ENCODERS'
 if test "$_mencoder" = yes ; then
   _mencoder_flag='#define HAVE_MENCODER'
   _def_muxers='#define CONFIG_MUXERS 1'
-  _def_encoders='#define CONFIG_ENCODERS 1'
-else
-  _libavencoders=""
+else
+  # mpeg1video for vf_lavc, snow for vf_uspp and vf_mcdeint
+  _libavencoders="MPEG1VIDEO_ENCODER SNOW_ENCODER"
   _libavmuxers=""
 fi
 echores "$_mencoder"
@@ -7935,7 +7934,7 @@
 /* Use libavcodec's decoders */
 #define CONFIG_DECODERS 1
 /* Use libavcodec's encoders */
-$_def_encoders
+#define CONFIG_ENCODERS 1
 
 /* Use libavformat's demuxers */
 #define CONFIG_DEMUXERS 1