# HG changeset patch # User diego # Date 1273856203 0 # Node ID 50eb33ac279b00107a1581cb72a2557363664a7d # Parent 93a2417ff7903cc7479e91e90bdffc04b11d1223 vf_zr requires the lavc MJPEG encoder even when MEncoder has been disabled. This fixes compilation with vo_zr enabled and MEncoder disabled. diff -r 93a2417ff790 -r 50eb33ac279b configure --- a/configure Fri May 14 16:13:53 2010 +0000 +++ b/configure Fri May 14 16:56:43 2010 +0000 @@ -7699,9 +7699,11 @@ 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