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 /libavcodec/motion-test.c | |
| 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 'libavcodec/motion-test.c')
| -rw-r--r-- | libavcodec/motion-test.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/motion-test.c b/libavcodec/motion-test.c index 73087177a1..7cfe41cf6e 100644 --- a/libavcodec/motion-test.c +++ b/libavcodec/motion-test.c @@ -28,7 +28,7 @@ #include <string.h> #include "config.h" -#include "dsputil.h" +#include "me_cmp.h" #include "libavutil/internal.h" #include "libavutil/lfg.h" #include "libavutil/mem.h" @@ -115,7 +115,7 @@ int main(int argc, char **argv) { AVCodecContext *ctx; int c; - DSPContext cctx, mmxctx; + MECmpContext cctx, mmxctx; int flags[2] = { AV_CPU_FLAG_MMX, AV_CPU_FLAG_MMXEXT }; int flags_size = HAVE_MMXEXT ? 2 : 1; @@ -130,12 +130,12 @@ int main(int argc, char **argv) ctx->flags |= CODEC_FLAG_BITEXACT; av_force_cpu_flags(0); memset(&cctx, 0, sizeof(cctx)); - ff_dsputil_init(&cctx, ctx); + ff_me_cmp_init(&cctx, ctx); for (c = 0; c < flags_size; c++) { int x; av_force_cpu_flags(flags[c]); memset(&mmxctx, 0, sizeof(mmxctx)); - ff_dsputil_init(&mmxctx, ctx); + ff_me_cmp_init(&mmxctx, ctx); for (x = 0; x < 2; x++) { printf("%s for %dx%d pixels\n", c ? "mmx2" : "mmx", |