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/f_select.c | |
| parent | 6be71e9955954422227f9691b4f5367a7169b099 (diff) | |
| parent | 2d60444331fca1910510038dd3817bea885c2367 (diff) | |
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/f_select.c')
| -rw-r--r-- | libavfilter/f_select.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavfilter/f_select.c b/libavfilter/f_select.c index c7c53b43ed..3579665bcb 100644 --- a/libavfilter/f_select.c +++ b/libavfilter/f_select.c @@ -35,7 +35,7 @@ #include "video.h" #if CONFIG_AVCODEC -#include "libavcodec/dsputil.h" +#include "libavcodec/me_cmp.h" #endif static const char *const var_names[] = { @@ -146,7 +146,7 @@ typedef struct SelectContext { int do_scene_detect; ///< 1 if the expression requires scene detection variables, 0 otherwise #if CONFIG_AVCODEC AVCodecContext *avctx; ///< codec context required for the DSPContext (scene detect only) - DSPContext c; ///< context providing optimized SAD methods (scene detect only) + MECmpContext c; ///< context providing optimized SAD methods (scene detect only) double prev_mafd; ///< previous MAFD (scene detect only) #endif AVFrame *prev_picref; ///< previous frame (scene detect only) @@ -245,7 +245,7 @@ static int config_input(AVFilterLink *inlink) select->avctx = avcodec_alloc_context3(NULL); if (!select->avctx) return AVERROR(ENOMEM); - avpriv_dsputil_init(&select->c, select->avctx); + ff_me_cmp_init(&select->c, select->avctx); } #endif return 0; |