mirror of
https://git.busybox.net/buildroot.git
synced 2024-11-23 13:33:28 +08:00
package/ffmpeg: fix gcc 14.x compile issue
Fixes:
- http://autobuild.buildroot.net/results/a04/a040cbc991da14c68302062ce96121b1e55c690e
Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit ade2db3ad2
)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
parent
5f8758451a
commit
253bbaae01
@ -0,0 +1,52 @@
|
|||||||
|
From 347a70f101be28f8d78e8fd62ffc3a78324f49e9 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
|
||||||
|
Date: Thu, 28 Mar 2024 05:35:36 +0100
|
||||||
|
Subject: [PATCH] avcodec/pcm-bluray/dvd: Use correct pointer types on BE
|
||||||
|
|
||||||
|
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
|
||||||
|
Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
|
||||||
|
Upstream: https://git.ffmpeg.org/gitweb/ffmpeg.git/commit/347a70f101be28f8d78e8fd62ffc3a78324f49e9
|
||||||
|
---
|
||||||
|
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;
|
||||||
|
--
|
||||||
|
2.39.2
|
||||||
|
|
Loading…
Reference in New Issue
Block a user