X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Falacenc.c;h=d921fa124cb381f4ecf284fd04500c710d419cc1;hb=83678dbbae64ad8c501e0c732c1117e642c25dae;hp=4857338e9c5efcbb5a100a1509ad7c002b45678f;hpb=243df1351d2d928caa084a5704ed783f0b83f072;p=ffmpeg diff --git a/libavcodec/alacenc.c b/libavcodec/alacenc.c index 4857338e9c5..d921fa124cb 100644 --- a/libavcodec/alacenc.c +++ b/libavcodec/alacenc.c @@ -59,6 +59,7 @@ typedef struct AlacLPCContext { } AlacLPCContext; typedef struct AlacEncodeContext { + const AVClass *class; AVCodecContext *avctx; int frame_size; /**< current frame size */ int verbatim; /**< current frame verbatim mode flag */ @@ -80,7 +81,7 @@ typedef struct AlacEncodeContext { static void init_sample_buffers(AlacEncodeContext *s, int channels, - uint8_t const *samples[2]) + const uint8_t *samples[2]) { int ch, i; int shift = av_get_bytes_per_sample(s->avctx->sample_fmt) * 8 - @@ -363,7 +364,7 @@ static void write_element(AlacEncodeContext *s, enum AlacRawDataBlockType element, int instance, const uint8_t *samples0, const uint8_t *samples1) { - uint8_t const *samples[2] = { samples0, samples1 }; + const uint8_t *samples[2] = { samples0, samples1 }; int i, j, channels; int prediction_type = 0; PutBitContext *pb = &s->pbctx; @@ -375,14 +376,14 @@ static void write_element(AlacEncodeContext *s, /* samples are channel-interleaved in verbatim mode */ if (s->avctx->sample_fmt == AV_SAMPLE_FMT_S32P) { int shift = 32 - s->avctx->bits_per_raw_sample; - int32_t const *samples_s32[2] = { (const int32_t *)samples0, + const int32_t *samples_s32[2] = { (const int32_t *)samples0, (const int32_t *)samples1 }; for (i = 0; i < s->frame_size; i++) for (j = 0; j < channels; j++) put_sbits(pb, s->avctx->bits_per_raw_sample, samples_s32[j][i] >> shift); } else { - int16_t const *samples_s16[2] = { (const int16_t *)samples0, + const int16_t *samples_s16[2] = { (const int16_t *)samples0, (const int16_t *)samples1 }; for (i = 0; i < s->frame_size; i++) for (j = 0; j < channels; j++)