diff options
author | attila <attila@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-10-16 08:45:10 +0000 |
---|---|---|
committer | attila <attila@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-10-16 08:45:10 +0000 |
commit | bf698904668eec367acea2d8ab5ef49e9e0e4b4a (patch) | |
tree | 788461add390ef3c3a0f6bc1a203e2e0f91d6db9 | |
parent | 9de35c6edc784ca2784f8bf24a7d73d48c2e1d0a (diff) | |
download | mpv-bf698904668eec367acea2d8ab5ef49e9e0e4b4a.tar.bz2 mpv-bf698904668eec367acea2d8ab5ef49e9e0e4b4a.tar.xz |
Fix compilation when libavcodec is missing.
Patch by Nico <nsabbi@libero.it>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11142 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r-- | cfg-common.h | 2 | ||||
-rwxr-xr-x | configure | 9 | ||||
-rw-r--r-- | libmpcodecs/Makefile | 6 | ||||
-rw-r--r-- | libmpcodecs/vf.c | 4 |
4 files changed, 16 insertions, 5 deletions
diff --git a/cfg-common.h b/cfg-common.h index 24820e4834..5e64467869 100644 --- a/cfg-common.h +++ b/cfg-common.h @@ -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 @@ -3289,6 +3289,7 @@ fi if test "$_dvb" = yes || test "$_dvbhead" = yes ; then _dvbin=yes + _inputmodules="dvb $_inputmodules" else _dvbin=no fi @@ -4769,6 +4770,11 @@ else 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 @@ elif test "$_libavcodecso" = yes ; then _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 @@ MATROSKA_LIB = $_ld_matroska OPENDIVX = $_opendivx UNRARLIB = $_unrarlib - +HAVE_FFPOSTPROCESS = $_def_haveffpostprocess PNG = $_mkf_png JPEG = $_mkf_jpg GIF = $_mkf_gif diff --git a/libmpcodecs/Makefile b/libmpcodecs/Makefile index d6983b67e7..a9fd5783dc 100644 --- a/libmpcodecs/Makefile +++ b/libmpcodecs/Makefile @@ -14,7 +14,11 @@ VIDEO_SRCS_NAT=vd_null.c vd_cinepak.c vd_qtrpza.c vd_raw.c vd_hmblck.c vd_msvidc VIDEO_SRCS_OPT=vd_realvid.c vd_ffmpeg.c vd_dshow.c vd_dmo.c vd_vfw.c vd_vfwex.c vd_odivx.c vd_divx4.c vd_xanim.c vd_xvid.c vd_libdv.c vd_qtvideo.c vd_theora.c VIDEO_SRCS=dec_video.c vd.c $(VIDEO_SRCS_NAT) $(VIDEO_SRCS_LIB) $(VIDEO_SRCS_OPT) -VFILTER_SRCS=vf.c vf_vo.c vf_crop.c vf_expand.c vf_pp.c vf_scale.c vf_format.c vf_yuy2.c vf_flip.c vf_rgb2bgr.c vf_rotate.c vf_mirror.c vf_palette.c vf_lavc.c vf_dvbscale.c vf_cropdetect.c vf_test.c vf_noise.c vf_yvu9.c vf_rectangle.c vf_lavcdeint.c vf_eq.c vf_eq2.c vf_halfpack.c vf_dint.c vf_1bpp.c vf_bmovl.c vf_2xsai.c vf_unsharp.c vf_swapuv.c vf_il.c vf_boxblur.c vf_sab.c vf_smartblur.c vf_perspective.c vf_down3dright.c vf_field.c vf_denoise3d.c vf_hqdn3d.c vf_detc.c vf_telecine.c vf_tfields.c vf_ivtc.c vf_ilpack.c vf_dsize.c vf_decimate.c vf_softpulldown.c vf_tinterlace.c vf_pullup.c pullup.c vf_framestep.c vf_tile.c vf_delogo.c +VFILTER_SRCS=vf.c vf_vo.c vf_crop.c vf_expand.c vf_scale.c vf_format.c vf_yuy2.c vf_flip.c vf_rgb2bgr.c vf_rotate.c vf_mirror.c vf_palette.c vf_lavc.c vf_dvbscale.c vf_cropdetect.c vf_test.c vf_noise.c vf_yvu9.c vf_rectangle.c vf_lavcdeint.c vf_eq.c vf_eq2.c vf_halfpack.c vf_dint.c vf_1bpp.c vf_bmovl.c vf_2xsai.c vf_unsharp.c vf_swapuv.c vf_il.c vf_boxblur.c vf_sab.c vf_smartblur.c vf_perspective.c vf_down3dright.c vf_field.c vf_denoise3d.c vf_hqdn3d.c vf_detc.c vf_telecine.c vf_tfields.c vf_ivtc.c vf_ilpack.c vf_dsize.c vf_decimate.c vf_softpulldown.c vf_tinterlace.c vf_pullup.c pullup.c vf_framestep.c vf_tile.c vf_delogo.c +ifeq ($(HAVE_FFPOSTPROCESS),yes) +VFILTER_SRCS += vf_pp.c +endif + ENCODER_SRCS=ve.c ve_divx4.c ve_lavc.c ve_vfw.c ve_rawrgb.c ve_libdv.c ve_xvid.c ve_qtvideo.c ve_nuv.c NATIVE_SRCS=native/RTjpegN.c native/cinepak.c native/fli.c native/minilzo.c native/msvidc.c native/nuppelvideo.c native/qtrle.c native/qtrpza.c native/qtsmc.c native/roqav.c native/xa_gsm.c native/decode144.c native/decode288.c diff --git a/libmpcodecs/vf.c b/libmpcodecs/vf.c index 2a10be62bc..aac1714c89 100644 --- a/libmpcodecs/vf.c +++ b/libmpcodecs/vf.c @@ -26,7 +26,9 @@ extern vf_info_t vf_info_bmovl; #endif extern vf_info_t vf_info_crop; extern vf_info_t vf_info_expand; +#ifdef FF_POSTPROCESS extern vf_info_t vf_info_pp; +#endif extern vf_info_t vf_info_scale; #ifdef USE_LIBFAME extern vf_info_t vf_info_fame; @@ -84,7 +86,7 @@ static vf_info_t* filter_list[]={ #endif &vf_info_crop, &vf_info_expand, -#ifdef USE_LIBAVCODEC +#ifdef FF_POSTPROCESS &vf_info_pp, #endif &vf_info_scale, |