Mercurial > mplayer.hg

changeset 34227:c2916bf4f140

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix compilation with --disable-mencoder.
author reimar
date Sun, 06 Nov 2011 22:41:37 +0000
parents 8b5513a75ab4
children 6a646612a081
files configure
diffstat 1 files changed, 3 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/configure	Sun Nov 06 13:11:58 2011 +0000
+++ b/configure	Sun Nov 06 22:41:37 2011 +0000
@@ -7108,14 +7108,11 @@
 
 
 echocheck "mencoder"
-if test "$_mencoder" = yes ; then
-  def_muxers='#define CONFIG_MUXERS 1'
-else
+if test "$_mencoder" = no ; then
   # mpeg1video for vf_lavc, snow for vf_uspp / vf_mcdeint,
   libavencoders="$mplayer_encoders MPEG1VIDEO_ENCODER SNOW_ENCODER"
   # needed for codec id -> tag conversion
   libavmuxers="AVI_MUXER"
-  def_muxers='#define CONFIG_MUXERS 0'
 fi
 echores "$_mencoder"
 
@@ -8261,7 +8258,7 @@
 CONFIG_ENCODERS = yes
 CONFIG_GPL      = yes
 CONFIG_MLIB     = $_mlib
-CONFIG_MUXERS   = $_mencoder
+CONFIG_MUXERS   = yes
 CONFIG_NETWORK  = $networking
 CONFIG_RTPDEC   = $networking
 CONFIG_VF_LAVFI = $_vf_lavfi
@@ -8681,7 +8678,7 @@
 #define CONFIG_DECODERS 1
 #define CONFIG_ENCODERS 1
 #define CONFIG_DEMUXERS 1
-$def_muxers
+#define CONFIG_MUXERS 1
 $def_rtpdec
 
 $def_arpa_inet_h