| @@ -48,7 +48,7 @@ typedef struct SilkFrame { · 47 unmodified lines |
| 48 | 48 | } SilkFrame; |
| 49 | 49 | |
| 50 | 50 | struct SilkContext { |
| 51 | | − AVCodecContext *avctx; |
| 51 | + void *logctx; |
| 52 | 52 | int output_channels; |
| 53 | 53 | |
| 54 | 54 | int midonly; |
| @@ -799,7 +799,7 @@ int ff_silk_decode_superframe(SilkContext *s, OpusRangeCoder *rc, · 744 unmodified lines |
| 799 | 799 | |
| 800 | 800 | if (bandwidth > OPUS_BANDWIDTH_WIDEBAND || |
| 801 | 801 | coded_channels > 2 || duration_ms > 60) { |
| 802 | | − av_log(s->avctx, AV_LOG_ERROR, "Invalid parameters passed " |
| 802 | + av_log(s->logctx, AV_LOG_ERROR, "Invalid parameters passed " |
| 803 | 803 | "to the SILK decoder.\n"); |
| 804 | 804 | return AVERROR(EINVAL); |
| 805 | 805 | } |
| @@ -879,12 +879,12 @@ void ff_silk_flush(SilkContext *s) · 73 unmodified lines |
| 879 | 879 | memset(s->prev_stereo_weights, 0, sizeof(s->prev_stereo_weights)); |
| 880 | 880 | } |
| 881 | 881 | |
| 882 | | −int ff_silk_init(AVCodecContext *avctx, SilkContext **ps, int output_channels) |
| 882 | +int ff_silk_init(void *logctx, SilkContext **ps, int output_channels) |
| 883 | 883 | { |
| 884 | 884 | SilkContext *s; |
| 885 | 885 | |
| 886 | 886 | if (output_channels != 1 && output_channels != 2) { |
| 887 | | − av_log(avctx, AV_LOG_ERROR, "Invalid number of output channels: %d\n", |
| 887 | + av_log(logctx, AV_LOG_ERROR, "Invalid number of output channels: %d\n", |
| 888 | 888 | output_channels); |
| 889 | 889 | return AVERROR(EINVAL); |
| 890 | 890 | } |
| @@ -893,7 +893,7 @@ int ff_silk_init(AVCodecContext *avctx, SilkContext **ps, int output_channels) · 2 unmodified lines |
| 893 | 893 | if (!s) |
| 894 | 894 | return AVERROR(ENOMEM); |
| 895 | 895 | |
| 896 | | − s->avctx = avctx; |
| 896 | + s->logctx = logctx; |
| 897 | 897 | s->output_channels = output_channels; |
| 898 | 898 | |
| 899 | 899 | ff_silk_flush(s); |