Signed-off-by: Andreas Rheinhardt <andreas.rheinha...@outlook.com>
---
libavcodec/flacenc.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/libavcodec/flacenc.c b/libavcodec/flacenc.c
index e29be5822b..3a9578f5cd 100644
--- a/libavcodec/flacenc.c
+++ b/libavcodec/flacenc.c
@@ -525,11 +525,10 @@ static void copy_samples(FlacEncodeContext *s, const void
*samples)
{
int i, j, ch;
FlacFrame *frame;
- int shift = av_get_bytes_per_sample(s->avctx->sample_fmt) * 8 -
- s->avctx->bits_per_raw_sample;
-#define COPY_SAMPLES(bits) do { \
+#define COPY_SAMPLES(bits, shift0) do { \
const int ## bits ## _t *samples0 = samples; \
+ const int shift = shift0; \
frame = &s->frame; \
for (i = 0, j = 0; i < frame->blocksize; i++) \
for (ch = 0; ch < s->channels; ch++, j++) \
@@ -537,9 +536,9 @@ static void copy_samples(FlacEncodeContext *s, const void
*samples)
} while (0)
if (s->avctx->sample_fmt == AV_SAMPLE_FMT_S16)
- COPY_SAMPLES(16);
+ COPY_SAMPLES(16, 0);
else
- COPY_SAMPLES(32);
+ COPY_SAMPLES(32, 32 - s->avctx->bits_per_raw_sample);
}
--
2.40.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
