diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-17 23:27:40 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-17 23:27:40 +0200 |
| commit | 3a2d1465c88625774530399b06dc4d48b24bb51f (patch) | |
| tree | 4be7740e2fca1a95af5ec112526c84ca69b64092 /libavfilter/libmpcodecs | |
| parent | 6be71e9955954422227f9691b4f5367a7169b099 (diff) | |
| parent | 2d60444331fca1910510038dd3817bea885c2367 (diff) | |
| download | ffmpeg-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/libmpcodecs')
| -rw-r--r-- | libavfilter/libmpcodecs/vf_fspp.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavfilter/libmpcodecs/vf_fspp.c b/libavfilter/libmpcodecs/vf_fspp.c index e1b26bc625..c4a36ef8a8 100644 --- a/libavfilter/libmpcodecs/vf_fspp.c +++ b/libavfilter/libmpcodecs/vf_fspp.c @@ -53,7 +53,6 @@ #include "libavutil/mem.h" #include "libavutil/x86/asm.h" #include "libavcodec/avcodec.h" -#include "libavcodec/dsputil.h" #undef free #undef malloc |