Mercurial > mplayer.hg

comparison configure @ 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 aee6d64fd1a6
comparison
equal deleted inserted replaced
31120:93a2417ff790 31121:50eb33ac279b
7697 7697
7698 echocheck "mencoder" 7698 echocheck "mencoder"
7699 if test "$_mencoder" = yes ; then 7699 if test "$_mencoder" = yes ; then
7700 def_muxers='#define CONFIG_MUXERS 1' 7700 def_muxers='#define CONFIG_MUXERS 1'
7701 else 7701 else
7702 # mpeg1video for vf_lavc, snow for vf_uspp and vf_mcdeint, png for vf_screenshot 7702 # mpeg1video for vf_lavc, snow for vf_uspp / vf_mcdeint,
7703 # png for vf_screenshot, mjpeg for zr
7703 _libavencoders="MPEG1VIDEO_ENCODER SNOW_ENCODER" 7704 _libavencoders="MPEG1VIDEO_ENCODER SNOW_ENCODER"
7704 test "$_zlib" = yes && _libavencoders="$_libavencoders PNG_ENCODER" 7705 test "$_zlib" = yes && _libavencoders="$_libavencoders PNG_ENCODER"
7706 test "$_zr" = yes && _libavencoders="$_libavencoders MJPEG_ENCODER"
7705 _libavmuxers="" 7707 _libavmuxers=""
7706 def_muxers='#define CONFIG_MUXERS 0' 7708 def_muxers='#define CONFIG_MUXERS 0'
7707 fi 7709 fi
7708 echores "$_mencoder" 7710 echores "$_mencoder"
7709 7711