diff options
| author | Uoti Urpala <uau@mplayer2.org> | 2011-12-31 04:33:12 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@mplayer2.org> | 2012-01-02 06:15:52 +0200 |
| commit | c32b3edfea3c4832f16a7cbcba4f8284170b3170 (patch) | |
| tree | c2074cb5d3067cd574a1cec1fccb54e1362a6888 | |
| parent | 30afc64532ff61577f6fa9d427f6803a00f2ad37 (diff) | |
| download | mpv-c32b3edfea3c4832f16a7cbcba4f8284170b3170.tar.bz2 mpv-c32b3edfea3c4832f16a7cbcba4f8284170b3170.tar.xz | |
vf_fspp: make compile without Libav internals
Make vf_fspp compile without using internal Libav/FFmpeg files and
compile it by default.
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | libmpcodecs/vf.c | 2 | ||||
| -rw-r--r-- | libmpcodecs/vf_fspp.c | 14 |
3 files changed, 9 insertions, 11 deletions
@@ -61,8 +61,7 @@ SRCS_COMMON-$(FAAD) += libmpcodecs/ad_faad.c SRCS_COMMON-$(FASTMEMCPY) += libvo/aclib.c # These filters use private headers and do not work with shared libavcodec. -SRCS_COMMON-$(FFMPEG_INTERNALS) += libmpcodecs/vf_fspp.c \ - libmpcodecs/vf_mcdeint.c \ +SRCS_COMMON-$(FFMPEG_INTERNALS) += libmpcodecs/vf_mcdeint.c \ libmpcodecs/vf_spp.c \ SRCS_COMMON-$(FREETYPE) += sub/font_load_ft.c @@ -312,6 +311,7 @@ SRCS_COMMON = asxparser.c \ libmpcodecs/vf_flip.c \ libmpcodecs/vf_format.c \ libmpcodecs/vf_framestep.c \ + libmpcodecs/vf_fspp.c \ libmpcodecs/vf_geq.c \ libmpcodecs/vf_gradfun.c \ libmpcodecs/vf_halfpack.c \ diff --git a/libmpcodecs/vf.c b/libmpcodecs/vf.c index e9ce26da0f..d973db6d3e 100644 --- a/libmpcodecs/vf.c +++ b/libmpcodecs/vf.c @@ -138,6 +138,7 @@ static const vf_info_t *const filter_list[] = { &vf_info_lavc, &vf_info_lavcdeint, &vf_info_screenshot, + &vf_info_fspp, &vf_info_uspp, &vf_info_dvbscale, @@ -182,7 +183,6 @@ static const vf_info_t *const filter_list[] = { &vf_info_hue, #ifdef CONFIG_FFMPEG_INTERNALS &vf_info_spp, - &vf_info_fspp, &vf_info_mcdeint, #endif &vf_info_geq, diff --git a/libmpcodecs/vf_fspp.c b/libmpcodecs/vf_fspp.c index e7e3af8310..da54892fb1 100644 --- a/libmpcodecs/vf_fspp.c +++ b/libmpcodecs/vf_fspp.c @@ -38,6 +38,10 @@ #include <inttypes.h> #include <math.h> +#include <libavutil/intreadwrite.h> +#include <libavutil/mem.h> +#include <libavcodec/avcodec.h> + #include "config.h" #include "mp_msg.h" @@ -46,15 +50,9 @@ #include "mp_image.h" #include "vf.h" #include "libvo/fastmemcpy.h" +#include "mangle.h" -#include "libavutil/internal.h" -#include "libavutil/intreadwrite.h" -#include "libavutil/mem.h" -#include "libavcodec/avcodec.h" -#include "libavcodec/dsputil.h" - -#undef free -#undef malloc +typedef short DCTELEM; //===========================================================================// #define BLOCKSZ 12 |