Mercurial > mplayer.hg

changeset 31121:50eb33ac279b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
vf_zr requires the lavc MJPEG encoder even when MEncoder has been disabled. This fixes compilation with vo_zr enabled and MEncoder disabled.
author diego
date Fri, 14 May 2010 16:56:43 +0000
parents 93a2417ff790
children 453095f84e98
files configure
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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