diff options
| author | uau <uau@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-03-03 03:02:36 +0000 |
|---|---|---|
| committer | uau <uau@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-03-03 03:02:36 +0000 |
| commit | 2e16b2826a904444162c6f2eb884f53aa0a2f053 (patch) | |
| tree | 222a71ebcb1996dda276cee6a80d87f3e169d9ed | |
| parent | a27f73390fd3305a8279fc2c183c2b0c42730b61 (diff) | |
| download | mpv-2e16b2826a904444162c6f2eb884f53aa0a2f053.tar.bz2 mpv-2e16b2826a904444162c6f2eb884f53aa0a2f053.tar.xz | |
configure: Set CONFIG_ENCODERS=yes in config.mak unconditionally
config.h already had "#define CONFIG_ENCODERS 1" unconditionally, but
the config.mak value depended on whether MEncoder was enabled.
Encoders need to be enabled as some encoder code is used by MPlayer
too. The inconsistent values broke compilation with --disable-mencoder
after libavcodec Makefile made compilation of i386/dsputilenc_mmx.o
depend on the config.mak value.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26142 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rwxr-xr-x | configure | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -7805,7 +7805,7 @@ CONFIG_LIBXVID=$_lavc_xvid CONFIG_LIBX264=$_lavc_x264 CONFIG_ZLIB=$_zlib CONFIG_GPL=yes -CONFIG_ENCODERS=$_mencoder +CONFIG_ENCODERS=yes CONFIG_MUXERS=$_mencoder # Prevent building libavcodec/imgresample.c with conflicting symbols CONFIG_SWSCALER=yes |