diff options
author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-05-14 16:56:43 +0000 |
---|---|---|
committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-05-14 16:56:43 +0000 |
commit | e4fc48153e209f3a0c8de51d9d5eebe82ad33157 (patch) | |
tree | 9282e380d88b85854257f9b3be7e82a07a7e4e26 | |
parent | 0624a90c9ae157b31a5bbbd9ef4e41a8d89f7bbd (diff) | |
download | mpv-e4fc48153e209f3a0c8de51d9d5eebe82ad33157.tar.bz2 mpv-e4fc48153e209f3a0c8de51d9d5eebe82ad33157.tar.xz |
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
-rwxr-xr-x | configure | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -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 |