From e4fc48153e209f3a0c8de51d9d5eebe82ad33157 Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Fri, 14 May 2010 16:56:43 +0000
Subject: 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
---
 configure | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'configure')

diff --git a/configure b/configure
index 2e13dc2e08..6308d11878 100755
--- a/configure
+++ b/configure
@@ -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
-- 
cgit v1.2.3