Add avpriv_dsputil_init() and use it in lavfi where relevant.

dsputil_init() is deprecated and not meant to be exported.
ff_dsputil_init() is internal to libavcodec and thus can not be used.
avpriv_dsputil_init() is the version shared between libraries.

This commit fixes 3 unjustified libavfilter deprecated warnings.
This commit is contained in:
Clément Bœsch 2013-04-14 04:34:06 +02:00
parent d4956b0bfb
commit 1e3104cd3c
5 changed files with 9 additions and 3 deletions

View File

@ -2928,3 +2928,8 @@ av_cold void dsputil_init(DSPContext* c, AVCodecContext *avctx)
{
ff_dsputil_init(c, avctx);
}
av_cold void avpriv_dsputil_init(DSPContext *c, AVCodecContext *avctx)
{
ff_dsputil_init(c, avctx);
}

View File

@ -315,6 +315,7 @@ typedef struct DSPContext {
void ff_dsputil_static_init(void);
void ff_dsputil_init(DSPContext* p, AVCodecContext *avctx);
void avpriv_dsputil_init(DSPContext* p, AVCodecContext *avctx);
attribute_deprecated void dsputil_init(DSPContext* c, AVCodecContext *avctx);
int ff_check_alignment(void);

View File

@ -199,7 +199,7 @@ static int config_input(AVFilterLink *inlink)
select->avctx = avcodec_alloc_context3(NULL);
if (!select->avctx)
return AVERROR(ENOMEM);
dsputil_init(&select->c, select->avctx);
avpriv_dsputil_init(&select->c, select->avctx);
}
#endif
return 0;

View File

@ -407,7 +407,7 @@ static int config_props(AVFilterLink *link)
deshake->last.zoom = 0;
deshake->avctx = avcodec_alloc_context3(NULL);
dsputil_init(&deshake->c, deshake->avctx);
avpriv_dsputil_init(&deshake->c, deshake->avctx);
return 0;
}

View File

@ -139,7 +139,7 @@ static av_cold int init(AVFilterContext *ctx)
decimate->avctx = avcodec_alloc_context3(NULL);
if (!decimate->avctx)
return AVERROR(ENOMEM);
dsputil_init(&decimate->dspctx, decimate->avctx);
avpriv_dsputil_init(&decimate->dspctx, decimate->avctx);
return 0;
}