diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-10 02:53:15 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-10 03:00:48 +0100 |
| commit | 402a411406854d20b3f3ab105185ccff7f6cd9ff (patch) | |
| tree | 0aa0b313eb532f5276e6048ea331b6df8e909493 /libavfilter/Makefile | |
| parent | 3b8299c1e1c72fdd4284d88e7d426bd35689acd3 (diff) | |
| parent | a7d0e7ead95e584c4866617f046b2493066975c6 (diff) | |
Merge commit 'a7d0e7ead95e584c4866617f046b2493066975c6'
* commit 'a7d0e7ead95e584c4866617f046b2493066975c6':
lavfi: add framepack filter
Conflicts:
Changelog
doc/filters.texi
libavfilter/allfilters.c
libavfilter/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/Makefile')
| -rw-r--r-- | libavfilter/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavfilter/Makefile b/libavfilter/Makefile index 3d587fe421..e9bc01945e 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -140,6 +140,7 @@ OBJS-$(CONFIG_FIELDORDER_FILTER) += vf_fieldorder.o OBJS-$(CONFIG_FORMAT_FILTER) += vf_format.o OBJS-$(CONFIG_FRAMESTEP_FILTER) += vf_framestep.o OBJS-$(CONFIG_FPS_FILTER) += vf_fps.o +OBJS-$(CONFIG_FRAMEPACK_FILTER) += vf_framepack.o OBJS-$(CONFIG_FREI0R_FILTER) += vf_frei0r.o OBJS-$(CONFIG_GEQ_FILTER) += vf_geq.o OBJS-$(CONFIG_GRADFUN_FILTER) += vf_gradfun.o |