aboutsummaryrefslogtreecommitdiffstats
path: root/libavfilter/vf_spp.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-07-17 23:27:40 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-07-17 23:27:40 +0200
commit3a2d1465c88625774530399b06dc4d48b24bb51f (patch)
tree4be7740e2fca1a95af5ec112526c84ca69b64092 /libavfilter/vf_spp.c
parent6be71e9955954422227f9691b4f5367a7169b099 (diff)
parent2d60444331fca1910510038dd3817bea885c2367 (diff)
downloadffmpeg-3a2d1465c88625774530399b06dc4d48b24bb51f.tar.gz
Merge commit '2d60444331fca1910510038dd3817bea885c2367'
* commit '2d60444331fca1910510038dd3817bea885c2367': dsputil: Split motion estimation compare bits off into their own context Conflicts: configure libavcodec/Makefile libavcodec/arm/Makefile libavcodec/dvenc.c libavcodec/error_resilience.c libavcodec/h264.h libavcodec/h264_slice.c libavcodec/me_cmp.c libavcodec/me_cmp.h libavcodec/motion_est.c libavcodec/motion_est_template.c libavcodec/mpeg4videoenc.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/x86/Makefile libavcodec/x86/me_cmp_init.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_spp.c')
-rw-r--r--libavfilter/vf_spp.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/libavfilter/vf_spp.c b/libavfilter/vf_spp.c
index 4e4a5795f4..bb85778647 100644
--- a/libavfilter/vf_spp.c
+++ b/libavfilter/vf_spp.c
@@ -31,7 +31,6 @@
* ported by Clément Bœsch for FFmpeg.
*/
-#include "libavcodec/dsputil.h"
#include "libavutil/avassert.h"
#include "libavutil/imgutils.h"
#include "libavutil/opt.h"