Unified · Split
| @@ -41,7 +41,6 @@ extern const uint16_t ff_wma_critical_freqs[25]; · 40 unmodified lines | |||
| 41 | #define BINK_BLOCK_MAX_SIZE (MAX_CHANNELS << 11) | 41 | #define BINK_BLOCK_MAX_SIZE (MAX_CHANNELS << 11) |
| 42 | 42 | ||
| 43 | typedef struct { | 43 | typedef struct { |
| 44 | AVCodecContext *avctx; | ||
| 45 | GetBitContext gb; | 44 | GetBitContext gb; |
| 46 | DSPContext dsp; | 45 | DSPContext dsp; |
| 47 | FmtConvertContext fmt_conv; | 46 | FmtConvertContext fmt_conv; |
| @@ -71,7 +70,6 @@ static av_cold int decode_init(AVCodecContext *avctx) · 23 unmodified lines | |||
| 71 | int i; | 70 | int i; |
| 72 | int frame_len_bits; | 71 | int frame_len_bits; |
| 73 | 72 | ||
| 74 | s->avctx = avctx; | ||
| 75 | dsputil_init(&s->dsp, avctx); | 73 | dsputil_init(&s->dsp, avctx); |
| 76 | ff_fmt_convert_init(&s->fmt_conv, avctx); | 74 | ff_fmt_convert_init(&s->fmt_conv, avctx); |
| 77 | 75 | ||
| @@ -86,7 +84,7 @@ static av_cold int decode_init(AVCodecContext *avctx) · 8 unmodified lines | |||
| 86 | s->frame_len = 1 << frame_len_bits; | 84 | s->frame_len = 1 << frame_len_bits; |
| 87 | 85 | ||
| 88 | if (avctx->channels > MAX_CHANNELS) { | 86 | if (avctx->channels > MAX_CHANNELS) { |
| 89 | av_log(s->avctx, AV_LOG_ERROR, "too many channels: %d\n", avctx->channels); | 87 | av_log(avctx, AV_LOG_ERROR, "too many channels: %d\n", avctx->channels); |
| 90 | return -1; | 88 | return -1; |
| 91 | } | 89 | } |
| 92 | 90 | ||