diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-24 13:47:45 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-24 14:07:00 +0200 |
commit | 8d4e969afe6bd15143a8a511587640417b0fb6dd (patch) | |
tree | 1608095a543b1c3549f20f9ab2d9e326e6e8169e /libavfilter/Makefile | |
parent | fe40a9f98f599699b0989d8c8cb35cb24eb2e52f (diff) | |
parent | 129bb238430ec45a3b5f8f1d384df590ddf7b62f (diff) | |
download | ffmpeg-streaming-8d4e969afe6bd15143a8a511587640417b0fb6dd.zip ffmpeg-streaming-8d4e969afe6bd15143a8a511587640417b0fb6dd.tar.gz |
Merge commit '129bb238430ec45a3b5f8f1d384df590ddf7b62f'
* commit '129bb238430ec45a3b5f8f1d384df590ddf7b62f':
lavfi: add a slice threading infrastructure
Conflicts:
Changelog
cmdutils.c
doc/APIchanges
libavfilter/Makefile
libavfilter/avfilter.c
libavfilter/avfilter.h
libavfilter/avfiltergraph.c
libavfilter/internal.h
libavfilter/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/Makefile')
-rw-r--r-- | libavfilter/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavfilter/Makefile b/libavfilter/Makefile index 6cc2930..fa601b5 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -240,6 +240,8 @@ OBJS-$(CONFIG_MOVIE_FILTER) += src_movie.o SKIPHEADERS-$(CONFIG_LIBVIDSTAB) += vidstabutils.h SKIPHEADERS-$(CONFIG_OPENCL) += opencl_internal.h deshake_opencl_kernel.h unsharp_opencl_kernel.h +OBJS-$(HAVE_THREADS) += pthread.o + TOOLS = graph2dot TESTPROGS = drawutils filtfmts formats |