diff options
| author | wm4 <wm4@mplayer2.org> | 2012-01-18 04:18:41 +0100 |
|---|---|---|
| committer | wm4 <wm4@mplayer2.org> | 2012-01-18 04:18:41 +0100 |
| commit | f341b21a90d27977562645fb80f0cbbc2a17af7b (patch) | |
| tree | af4b95b39fa865ddcaa5a448b7e04a0f5e220f57 /Makefile | |
| parent | 4e76c7514f847648cdc9740d6ef997d1653effa8 (diff) | |
| parent | c4093e7d872d2daa485029b8b36661411387ef37 (diff) | |
| download | mpv-f341b21a90d27977562645fb80f0cbbc2a17af7b.tar.bz2 mpv-f341b21a90d27977562645fb80f0cbbc2a17af7b.tar.xz | |
Merge remote-tracking branch 'origin/master' into my_master
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 10 |
1 files changed, 4 insertions, 6 deletions
@@ -60,13 +60,8 @@ SRCS_COMMON-$(DVDREAD_INTERNAL) += libdvdread4/bitreader.c \ SRCS_COMMON-$(FAAD) += libmpcodecs/ad_faad.c SRCS_COMMON-$(FASTMEMCPY) += libvo/aclib.c -# Requires a new enough libavutil that installs eval.h -SRCS_COMMON-$(FFMPEG_EVAL_API) += libmpcodecs/vf_geq.c \ - libmpcodecs/vf_qp.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 @@ -316,6 +311,8 @@ 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 \ libmpcodecs/vf_harddup.c \ @@ -337,6 +334,7 @@ SRCS_COMMON = asxparser.c \ libmpcodecs/vf_pp.c \ libmpcodecs/vf_pp7.c \ libmpcodecs/vf_pullup.c \ + libmpcodecs/vf_qp.c \ libmpcodecs/vf_rectangle.c \ libmpcodecs/vf_remove_logo.c \ libmpcodecs/vf_rgbtest.c \ |