ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | Thu Sep 28 21:37:26 2023 +0200| [40aa451154fc54b661036bfb90532199269397bc] | committer: Andreas Rheinhardt avcodec/opus_silk: Use void* instead of AVCodecContext* as logctx Reviewed-by: Lynne <dev@lynne.ee> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>

http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=40aa451154fc54b661...

libavcodec/opus_silk.c | 10 +++++----- libavcodec/opus_silk.h | 3 +-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/libavcodec/opus_silk.c b/libavcodec/opus_silk.c index cf8b16acff..27671516a0 100644 --- a/libavcodec/opus_silk.c +++ b/libavcodec/opus_silk.c @@ -48,7 +48,7 @@ typedef struct SilkFrame { } SilkFrame; struct SilkContext { - AVCodecContext *avctx; + void *logctx; int output_channels; int midonly; @@ -799,7 +799,7 @@ int ff_silk_decode_superframe(SilkContext *s, OpusRangeCoder *rc, if (bandwidth > OPUS_BANDWIDTH_WIDEBAND || coded_channels > 2 || duration_ms > 60) { - av_log(s->avctx, AV_LOG_ERROR, "Invalid parameters passed " + av_log(s->logctx, AV_LOG_ERROR, "Invalid parameters passed " "to the SILK decoder.\n"); return AVERROR(EINVAL); } @@ -879,12 +879,12 @@ void ff_silk_flush(SilkContext *s) memset(s->prev_stereo_weights, 0, sizeof(s->prev_stereo_weights)); } -int ff_silk_init(AVCodecContext *avctx, SilkContext **ps, int output_channels) +int ff_silk_init(void *logctx, SilkContext **ps, int output_channels) { SilkContext *s; if (output_channels != 1 && output_channels != 2) { - av_log(avctx, AV_LOG_ERROR, "Invalid number of output channels: %d\n", + av_log(logctx, AV_LOG_ERROR, "Invalid number of output channels: %d\n", output_channels); return AVERROR(EINVAL); } @@ -893,7 +893,7 @@ int ff_silk_init(AVCodecContext *avctx, SilkContext **ps, int output_channels) if (!s) return AVERROR(ENOMEM); - s->avctx = avctx; + s->logctx = logctx; s->output_channels = output_channels; ff_silk_flush(s); diff --git a/libavcodec/opus_silk.h b/libavcodec/opus_silk.h index 6552c166a4..4b595da2b9 100644 --- a/libavcodec/opus_silk.h +++ b/libavcodec/opus_silk.h @@ -23,7 +23,6 @@ #ifndef AVCODEC_OPUS_SILK_H #define AVCODEC_OPUS_SILK_H -#include "avcodec.h" #include "opus.h" #include "opus_rc.h" @@ -32,7 +31,7 @@ typedef struct SilkContext SilkContext; -int ff_silk_init(AVCodecContext *avctx, SilkContext **ps, int output_channels); +int ff_silk_init(void *logctx, SilkContext **ps, int output_channels); void ff_silk_free(SilkContext **ps); void ff_silk_flush(SilkContext *s);