vf_zr requires the lavc MJPEG encoder even when MEncoder has been disabled.

This fixes compilation with vo_zr enabled and MEncoder disabled.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31178 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
diego 2010-05-14 16:56:43 +00:00
parent 0624a90c9a
commit e4fc48153e
1 changed files with 3 additions and 1 deletions

4
configure vendored
View File

@ -7699,9 +7699,11 @@ echocheck "mencoder"
if test "$_mencoder" = yes ; then
def_muxers='#define CONFIG_MUXERS 1'
else
# mpeg1video for vf_lavc, snow for vf_uspp and vf_mcdeint, png for vf_screenshot
# mpeg1video for vf_lavc, snow for vf_uspp / vf_mcdeint,
# png for vf_screenshot, mjpeg for zr
_libavencoders="MPEG1VIDEO_ENCODER SNOW_ENCODER"
test "$_zlib" = yes && _libavencoders="$_libavencoders PNG_ENCODER"
test "$_zr" = yes && _libavencoders="$_libavencoders MJPEG_ENCODER"
_libavmuxers=""
def_muxers='#define CONFIG_MUXERS 0'
fi