diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-17 19:35:03 +0100 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-17 19:35:03 +0100 |
| commit | 9d4799c247e305ab480198e4942d229a2949ea9b (patch) | |
| tree | 578dda879d68c9a03a5969bfd1c4e8334144e336 /libavcodec/alacenc.c | |
| parent | 61400a1dc751c82cf6f33a7510c3804b7b201f25 (diff) | |
| parent | 8dead2aaca4aa8b84b77b05745755afb56b7d37a (diff) | |
| download | ffmpeg-9d4799c247e305ab480198e4942d229a2949ea9b.tar.gz | |
Merge commit '8dead2aaca4aa8b84b77b05745755afb56b7d37a'
* commit '8dead2aaca4aa8b84b77b05745755afb56b7d37a':
Move const qualifier before type name
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavcodec/alacenc.c')
| -rw-r--r-- | libavcodec/alacenc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/alacenc.c b/libavcodec/alacenc.c index c80c887699..9ac35f1a14 100644 --- a/libavcodec/alacenc.c +++ b/libavcodec/alacenc.c @@ -81,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 - @@ -364,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; @@ -376,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++) |