| Message ID | AS8P250MB07446C9584965A185F9DD1A68F3B2@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM |
|---|---|
| State | Accepted |
| Commit | 347a70f101be28f8d78e8fd62ffc3a78324f49e9 |
| Headers | show |
| Series | [FFmpeg-devel,01/18] avcodec/mips/ac3dsp_mips: Add missing includes | expand |
| Context | Check | Description |
|---|---|---|
| yinshiyou/make_loongarch64 | success | Make finished |
| yinshiyou/make_fate_loongarch64 | success | Make fate finished |
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
Hi On 2024-03-29 00:10:31 +0100, Andreas Rheinhardt wrote: > Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> > --- > libavcodec/pcm-bluray.c | 5 +++-- > libavcodec/pcm-dvd.c | 2 +- > 2 files changed, 4 insertions(+), 3 deletions(-) > > diff --git a/libavcodec/pcm-bluray.c b/libavcodec/pcm-bluray.c > index f65609514a..235020d78f 100644 > --- a/libavcodec/pcm-bluray.c > +++ b/libavcodec/pcm-bluray.c > @@ -167,7 +167,7 @@ static int pcm_bluray_decode_frame(AVCodecContext *avctx, AVFrame *frame, > samples *= num_source_channels; > if (AV_SAMPLE_FMT_S16 == avctx->sample_fmt) { > #if HAVE_BIGENDIAN > - bytestream2_get_buffer(&gb, dst16, buf_size); > + bytestream2_get_buffer(&gb, (uint8_t*)dst16, buf_size); > #else > do { > *dst16++ = bytestream2_get_be16u(&gb); > @@ -187,7 +187,8 @@ static int pcm_bluray_decode_frame(AVCodecContext *avctx, AVFrame *frame, > if (AV_SAMPLE_FMT_S16 == avctx->sample_fmt) { > do { > #if HAVE_BIGENDIAN > - bytestream2_get_buffer(&gb, dst16, avctx->ch_layout.nb_channels * 2); > + bytestream2_get_buffer(&gb, (uint8_t*)dst16, > + avctx->ch_layout.nb_channels * 2); > dst16 += avctx->ch_layout.nb_channels; > #else > channel = avctx->ch_layout.nb_channels; > diff --git a/libavcodec/pcm-dvd.c b/libavcodec/pcm-dvd.c > index 419b2a138f..319746c62e 100644 > --- a/libavcodec/pcm-dvd.c > +++ b/libavcodec/pcm-dvd.c > @@ -157,7 +157,7 @@ static void *pcm_dvd_decode_samples(AVCodecContext *avctx, const uint8_t *src, > switch (avctx->bits_per_coded_sample) { > case 16: { > #if HAVE_BIGENDIAN > - bytestream2_get_buffer(&gb, dst16, blocks * s->block_size); > + bytestream2_get_buffer(&gb, (uint8_t*)dst16, blocks * s->block_size); > dst16 += blocks * s->block_size / 2; > #else > int samples = blocks * avctx->ch_layout.nb_channels; > -- Please backport this patch to 7.0 to fix https://trac.ffmpeg.org/ticket/11119 Cheers
diff --git a/libavcodec/pcm-bluray.c b/libavcodec/pcm-bluray.c index f65609514a..235020d78f 100644 --- a/libavcodec/pcm-bluray.c +++ b/libavcodec/pcm-bluray.c @@ -167,7 +167,7 @@ static int pcm_bluray_decode_frame(AVCodecContext *avctx, AVFrame *frame, samples *= num_source_channels; if (AV_SAMPLE_FMT_S16 == avctx->sample_fmt) { #if HAVE_BIGENDIAN - bytestream2_get_buffer(&gb, dst16, buf_size); + bytestream2_get_buffer(&gb, (uint8_t*)dst16, buf_size); #else do { *dst16++ = bytestream2_get_be16u(&gb); @@ -187,7 +187,8 @@ static int pcm_bluray_decode_frame(AVCodecContext *avctx, AVFrame *frame, if (AV_SAMPLE_FMT_S16 == avctx->sample_fmt) { do { #if HAVE_BIGENDIAN - bytestream2_get_buffer(&gb, dst16, avctx->ch_layout.nb_channels * 2); + bytestream2_get_buffer(&gb, (uint8_t*)dst16, + avctx->ch_layout.nb_channels * 2); dst16 += avctx->ch_layout.nb_channels; #else channel = avctx->ch_layout.nb_channels; diff --git a/libavcodec/pcm-dvd.c b/libavcodec/pcm-dvd.c index 419b2a138f..319746c62e 100644 --- a/libavcodec/pcm-dvd.c +++ b/libavcodec/pcm-dvd.c @@ -157,7 +157,7 @@ static void *pcm_dvd_decode_samples(AVCodecContext *avctx, const uint8_t *src, switch (avctx->bits_per_coded_sample) { case 16: { #if HAVE_BIGENDIAN - bytestream2_get_buffer(&gb, dst16, blocks * s->block_size); + bytestream2_get_buffer(&gb, (uint8_t*)dst16, blocks * s->block_size); dst16 += blocks * s->block_size / 2; #else int samples = blocks * avctx->ch_layout.nb_channels;
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> --- libavcodec/pcm-bluray.c | 5 +++-- libavcodec/pcm-dvd.c | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-)