diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-25 23:56:13 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-26 15:21:07 +0400 |
commit | c0a586d9d5cd99e9f36e4d190f9aa137803378dc (patch) | |
tree | 1a293a6c72150ff755e8ee0bff97d11bf2975f6c /libavfilter | |
parent | 9a6ca20ef6755af33bdf4c8a2fbc60fdb36e9b42 (diff) |
reintroduce avpriv_dsputil_init() to maintain ABI until next soname bump
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter')
-rw-r--r-- | libavfilter/deshake.h | 4 | ||||
-rw-r--r-- | libavfilter/f_select.c | 6 | ||||
-rw-r--r-- | libavfilter/vf_deshake.c | 4 | ||||
-rw-r--r-- | libavfilter/vf_mpdecimate.c | 10 |
4 files changed, 12 insertions, 12 deletions
diff --git a/libavfilter/deshake.h b/libavfilter/deshake.h index 568d022602..615953cfe3 100644 --- a/libavfilter/deshake.h +++ b/libavfilter/deshake.h @@ -24,7 +24,7 @@ #include "config.h" #include "avfilter.h" -#include "libavcodec/me_cmp.h" +#include "libavcodec/dsputil.h" #include "transform.h" #if CONFIG_OPENCL #include "libavutil/opencl.h" @@ -81,7 +81,7 @@ typedef struct { int contrast; ///< Contrast threshold int search; ///< Motion search method AVCodecContext *avctx; - MECmpContext c; ///< Context providing optimized SAD methods + DSPContext c; ///< Context providing optimized SAD methods Transform last; ///< Transform from last frame int refcount; ///< Number of reference frames (defines averaging window) FILE *fp; diff --git a/libavfilter/f_select.c b/libavfilter/f_select.c index 3579665bcb..c7c53b43ed 100644 --- a/libavfilter/f_select.c +++ b/libavfilter/f_select.c @@ -35,7 +35,7 @@ #include "video.h" #if CONFIG_AVCODEC -#include "libavcodec/me_cmp.h" +#include "libavcodec/dsputil.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) - MECmpContext c; ///< context providing optimized SAD methods (scene detect only) + DSPContext 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); - ff_me_cmp_init(&select->c, select->avctx); + avpriv_dsputil_init(&select->c, select->avctx); } #endif return 0; diff --git a/libavfilter/vf_deshake.c b/libavfilter/vf_deshake.c index 9a56b71b39..50aa451a32 100644 --- a/libavfilter/vf_deshake.c +++ b/libavfilter/vf_deshake.c @@ -57,7 +57,7 @@ #include "libavutil/mem.h" #include "libavutil/opt.h" #include "libavutil/pixdesc.h" -#include "libavcodec/me_cmp.h" +#include "libavcodec/dsputil.h" #include "deshake.h" #include "deshake_opencl.h" @@ -414,7 +414,7 @@ static int config_props(AVFilterLink *link) deshake->last.zoom = 0; deshake->avctx = avcodec_alloc_context3(NULL); - ff_me_cmp_init(&deshake->c, deshake->avctx); + avpriv_dsputil_init(&deshake->c, deshake->avctx); return 0; } diff --git a/libavfilter/vf_mpdecimate.c b/libavfilter/vf_mpdecimate.c index b030f06b19..c667a9f4cc 100644 --- a/libavfilter/vf_mpdecimate.c +++ b/libavfilter/vf_mpdecimate.c @@ -27,7 +27,7 @@ #include "libavutil/opt.h" #include "libavutil/pixdesc.h" #include "libavutil/timestamp.h" -#include "libavcodec/me_cmp.h" +#include "libavcodec/dsputil.h" #include "libavcodec/pixblockdsp.h" #include "avfilter.h" #include "internal.h" @@ -49,7 +49,7 @@ typedef struct { int hsub, vsub; ///< chroma subsampling values AVFrame *ref; ///< reference picture - MECmpContext mecc; ///< context providing optimized diff routines + DSPContext dspctx; ///< context providing optimized diff routines PixblockDSPContext pdsp; AVCodecContext *avctx; ///< codec context required for the DSPContext } DecimateContext; @@ -76,7 +76,7 @@ static int diff_planes(AVFilterContext *ctx, int w, int h) { DecimateContext *decimate = ctx->priv; - MECmpContext *mecc = &decimate->mecc; + DSPContext *dspctx = &decimate->dspctx; PixblockDSPContext *pdsp = &decimate->pdsp; int x, y; @@ -90,7 +90,7 @@ static int diff_planes(AVFilterContext *ctx, pdsp->diff_pixels(block, cur+x+y*linesize, ref+x+y*linesize, linesize); - d = mecc->sum_abs_dctelem(block); + d = dspctx->sum_abs_dctelem(block); if (d > decimate->hi) return 1; if (d > decimate->lo) { @@ -143,7 +143,7 @@ static av_cold int init(AVFilterContext *ctx) decimate->avctx = avcodec_alloc_context3(NULL); if (!decimate->avctx) return AVERROR(ENOMEM); - ff_me_cmp_init(&decimate->mecc, decimate->avctx); + avpriv_dsputil_init(&decimate->dspctx, decimate->avctx); ff_pixblockdsp_init(&decimate->pdsp, decimate->avctx); return 0; |