Update of /cvsroot/mplayer/main In directory mail:/var/tmp.root/cvs-serv13350 Modified Files: cfg-common.h configure Log Message: Fix compilation when libavcodec is missing. Patch by Nico <nsabbi@libero.it> Index: cfg-common.h =================================================================== RCS file: /cvsroot/mplayer/main/cfg-common.h,v retrieving revision 1.113 retrieving revision 1.114 diff -u -r1.113 -r1.114 --- cfg-common.h 14 Oct 2003 10:15:35 -0000 1.113 +++ cfg-common.h 16 Oct 2003 08:44:34 -0000 1.114 @@ -166,7 +166,7 @@ {"oldpp", "MPlayer was compiled without opendivx library\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, #endif {"npp", "-npp has been removed, use -vop pp and read the fine manual\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, -#ifdef USE_LIBAVCODEC +#ifdef FF_POSTPROCESS {"pphelp", &pp_help, CONF_TYPE_PRINT_INDIRECT, CONF_NOCFG, 0, 0, NULL}, #endif Index: configure =================================================================== RCS file: /cvsroot/mplayer/main/configure,v retrieving revision 1.785 retrieving revision 1.786 diff -u -r1.785 -r1.786 --- configure 14 Oct 2003 12:14:48 -0000 1.785 +++ configure 16 Oct 2003 08:44:34 -0000 1.786 @@ -3289,6 +3289,7 @@ if test "$_dvb" = yes || test "$_dvbhead" = yes ; then _dvbin=yes + _inputmodules="dvb $_inputmodules" else _dvbin=no fi @@ -4769,6 +4770,11 @@ echores "$_libavcodec" fi +_def_haveffpostprocess='no' +if test -d libavcodec && test -f libavcodec/libpostproc/postprocess.h ; then + _def_haveffpostprocess='yes' +fi + if test "$_libavcodec" != yes ; then echocheck "FFmpeg libavcodec (dynamic)" if test "$_libavcodecso" = auto ; then @@ -4806,7 +4812,6 @@ _def_libavcodec='#define USE_LIBAVCODEC 1' _def_libavcodecso='#define USE_LIBAVCODEC_SO 1' _ld_libavcodec='-lavcodec' - _def_ffpostprocess='#define FF_POSTPROCESS 1' _codecmodules="libavcodec.so $_codecmodules" else _nocodecmodules="libavcodec $_nocodecmodules" @@ -5676,7 +5681,7 @@ OPENDIVX = $_opendivx UNRARLIB = $_unrarlib - +HAVE_FFPOSTPROCESS = $_def_haveffpostprocess PNG = $_mkf_png JPEG = $_mkf_jpg GIF = $_mkf_gif