[MPlayer-cvslog] r31178 - trunk/configure

[diego]

Author: diego
Date: Fri May 14 18:56:43 2010
New Revision: 31178

Log:
vf_zr requires the lavc MJPEG encoder even when MEncoder has been disabled.
This fixes compilation with vo_zr enabled and MEncoder disabled.

Modified:
   trunk/configure

Modified: trunk/configure
==============================================================================
--- trunk/configure	Fri May 14 18:13:53 2010	(r31177)
+++ trunk/configure	Fri May 14 18:56:43 2010	(r31178)
@@ -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