mirror of https://git.ffmpeg.org/ffmpeg.git
libvpxdec: Correct linking against variables.
Instead link against the function that returns the correct variable. This fixes linking errors with dlls with msvc.
This commit is contained in:
parent
7e9e2cf93b
commit
1a5930b554
|
@ -242,11 +242,11 @@ static int vpx_decode(AVCodecContext *avctx,
|
||||||
&ctx->decoder_alpha,
|
&ctx->decoder_alpha,
|
||||||
#if CONFIG_LIBVPX_VP8_DECODER && CONFIG_LIBVPX_VP9_DECODER
|
#if CONFIG_LIBVPX_VP8_DECODER && CONFIG_LIBVPX_VP9_DECODER
|
||||||
(avctx->codec_id == AV_CODEC_ID_VP8) ?
|
(avctx->codec_id == AV_CODEC_ID_VP8) ?
|
||||||
&vpx_codec_vp8_dx_algo : &vpx_codec_vp9_dx_algo
|
vpx_codec_vp8_dx() : vpx_codec_vp9_dx()
|
||||||
#elif CONFIG_LIBVPX_VP8_DECODER
|
#elif CONFIG_LIBVPX_VP8_DECODER
|
||||||
&vpx_codec_vp8_dx_algo
|
vpx_codec_vp8_dx()
|
||||||
#else
|
#else
|
||||||
&vpx_codec_vp9_dx_algo
|
vpx_codec_vp9_dx()
|
||||||
#endif
|
#endif
|
||||||
);
|
);
|
||||||
if (ret)
|
if (ret)
|
||||||
|
@ -350,7 +350,7 @@ static av_cold int vpx_free(AVCodecContext *avctx)
|
||||||
static av_cold int vp8_init(AVCodecContext *avctx)
|
static av_cold int vp8_init(AVCodecContext *avctx)
|
||||||
{
|
{
|
||||||
VPxContext *ctx = avctx->priv_data;
|
VPxContext *ctx = avctx->priv_data;
|
||||||
return vpx_init(avctx, &ctx->decoder, &vpx_codec_vp8_dx_algo);
|
return vpx_init(avctx, &ctx->decoder, vpx_codec_vp8_dx());
|
||||||
}
|
}
|
||||||
|
|
||||||
const AVCodec ff_libvpx_vp8_decoder = {
|
const AVCodec ff_libvpx_vp8_decoder = {
|
||||||
|
@ -372,7 +372,7 @@ const AVCodec ff_libvpx_vp8_decoder = {
|
||||||
static av_cold int vp9_init(AVCodecContext *avctx)
|
static av_cold int vp9_init(AVCodecContext *avctx)
|
||||||
{
|
{
|
||||||
VPxContext *ctx = avctx->priv_data;
|
VPxContext *ctx = avctx->priv_data;
|
||||||
return vpx_init(avctx, &ctx->decoder, &vpx_codec_vp9_dx_algo);
|
return vpx_init(avctx, &ctx->decoder, vpx_codec_vp9_dx());
|
||||||
}
|
}
|
||||||
|
|
||||||
AVCodec ff_libvpx_vp9_decoder = {
|
AVCodec ff_libvpx_vp9_decoder = {
|
||||||
|
|
Loading…
Reference in New Issue