summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-07-08 17:09:35 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-07-08 17:09:35 +0000
commit11f38c9502b2900762288f2b80be280b5e9a2d8b (patch)
treec2fb4f0341cbe25bc26d8673197c3d42e6f14f76 /configure
parent2670f98ab45e6e516a5afeade7ef7dfc641766ed (diff)
downloadmpv-11f38c9502b2900762288f2b80be280b5e9a2d8b.tar.bz2
mpv-11f38c9502b2900762288f2b80be280b5e9a2d8b.tar.xz
Do not compile FFmpeg muxers and encoders unless MEncoder is enabled.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18960 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure9
1 files changed, 6 insertions, 3 deletions
diff --git a/configure b/configure
index de88901e82..60d982b468 100755
--- a/configure
+++ b/configure
@@ -6689,6 +6689,8 @@ echocheck "mencoder"
_mencoder_flag='#undef HAVE_MENCODER'
if test "$_mencoder" = yes ; then
_mencoder_flag='#define HAVE_MENCODER'
+ _def_encoders='#define CONFIG_ENCODERS 1'
+ _def_muxers='#define CONFIG_MUXERS 1'
fi
echores "$_mencoder"
@@ -7593,7 +7595,8 @@ CONFIG_FAAC=$_faac
CONFIG_XVID=$_lavc_xvid
CONFIG_X264=$_x264
CONFIG_GPL=yes
-CONFIG_MUXERS=yes
+CONFIG_ENCODERS=$_mencoder
+CONFIG_MUXERS=$_mencoder
# --- Some stuff for autoconfigure ----
$_target_arch
@@ -7944,12 +7947,12 @@ $_def_libavutil_so
/* Use libavcodec's decoders */
#define CONFIG_DECODERS 1
/* Use libavcodec's encoders */
-#define CONFIG_ENCODERS 1
+$_def_encoders
/* Use libavformat's demuxers */
#define CONFIG_DEMUXERS 1
/* Use libavformat's muxers */
-#define CONFIG_MUXERS 1
+$_def_muxers
#define CONFIG_MPEGAUDIO_HP 1