summaryrefslogtreecommitdiffstats
path: root/package/squeezelite/0003-Replace-deprecated-FFmpeg-API.patch
diff options
context:
space:
mode:
authorBernd Kuhls <bernd.kuhls@t-online.de>2018-08-25 09:31:17 +0200
committerThomas Petazzoni <thomas.petazzoni@bootlin.com>2018-09-08 23:25:36 +0200
commit45841bd443c0c360f8f205445f85bc607de1b219 (patch)
tree1d676d4059f2b33fb312fffe81101b5b00820f0c /package/squeezelite/0003-Replace-deprecated-FFmpeg-API.patch
parent0b1794cb43ab2c67ea619b69717f6499dcd410ee (diff)
downloadbuildroot-45841bd443c0c360f8f205445f85bc607de1b219.tar.gz
buildroot-45841bd443c0c360f8f205445f85bc607de1b219.zip
package/squeezelite: fix build with FFmpeg 4.0
Git-formatted patch 0003. Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Diffstat (limited to 'package/squeezelite/0003-Replace-deprecated-FFmpeg-API.patch')
-rw-r--r--package/squeezelite/0003-Replace-deprecated-FFmpeg-API.patch65
1 files changed, 65 insertions, 0 deletions
diff --git a/package/squeezelite/0003-Replace-deprecated-FFmpeg-API.patch b/package/squeezelite/0003-Replace-deprecated-FFmpeg-API.patch
new file mode 100644
index 0000000000..74d8f1be55
--- /dev/null
+++ b/package/squeezelite/0003-Replace-deprecated-FFmpeg-API.patch
@@ -0,0 +1,65 @@
+From cce6a0378ac319b87d2545d73f593d440bf686f5 Mon Sep 17 00:00:00 2001
+From: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
+Date: Sat, 18 Aug 2018 13:25:23 +0200
+Subject: [PATCH] Replace deprecated FFmpeg API
+
+Fixes compilation with ffmpeg >= 2.9.
+
+Downloaded from Debian:
+https://sources.debian.org/src/squeezelite/1.8-4.1/debian/patches/ffmpeg_2.9.patch/
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ ffmpeg.c | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/ffmpeg.c b/ffmpeg.c
+index 279f31d..bc9136c 100644
+--- a/ffmpeg.c
++++ b/ffmpeg.c
+@@ -52,8 +52,8 @@ struct ff_s {
+ unsigned (* avcodec_version)(void);
+ AVCodec * (* avcodec_find_decoder)(int);
+ int attribute_align_arg (* avcodec_open2)(AVCodecContext *, const AVCodec *, AVDictionary **);
+- AVFrame * (* avcodec_alloc_frame)(void);
+- void (* avcodec_free_frame)(AVFrame **);
++ AVFrame * (* av_frame_alloc)(void);
++ void (* av_frame_free)(AVFrame **);
+ int attribute_align_arg (* avcodec_decode_audio4)(AVCodecContext *, AVFrame *, int *, const AVPacket *);
+ // ffmpeg symbols to be dynamically loaded from libavformat
+ unsigned (* avformat_version)(void);
+@@ -324,7 +324,7 @@ static decode_state ff_decode(void) {
+
+ AVCODEC(ff, open2, ff->codecC, codec, NULL);
+
+- ff->frame = AVCODEC(ff, alloc_frame);
++ ff->frame = AV(ff, frame_alloc);
+
+ ff->avpkt = AV(ff, malloc, sizeof(AVPacket));
+ if (ff->avpkt == NULL) {
+@@ -520,9 +520,9 @@ static void _free_ff_data(void) {
+ if (ff->frame) {
+ // ffmpeg version dependant free function
+ #if !LINKALL
+- ff->avcodec_free_frame ? AVCODEC(ff, free_frame, &ff->frame) : AV(ff, freep, &ff->frame);
++ ff->av_frame_free ? AV(ff, frame_free, &ff->frame) : AV(ff, freep, &ff->frame);
+ #elif LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(54,28,0)
+- AVCODEC(ff, free_frame, &ff->frame);
++ AV(ff, frame_free, &ff->frame);
+ #else
+ AV(ff, freep, &ff->frame);
+ #endif
+@@ -607,8 +607,8 @@ static bool load_ff() {
+ ff->avcodec_version = dlsym(handle_codec, "avcodec_version");
+ ff->avcodec_find_decoder = dlsym(handle_codec, "avcodec_find_decoder");
+ ff->avcodec_open2 = dlsym(handle_codec, "avcodec_open2");
+- ff->avcodec_alloc_frame = dlsym(handle_codec, "avcodec_alloc_frame");
+- ff->avcodec_free_frame = dlsym(handle_codec, "avcodec_free_frame");
++ ff->av_frame_alloc = dlsym(handle_codec, "av_frame_alloc");
++ ff->av_frame_free = dlsym(handle_codec, "av_frame_free");
+ ff->avcodec_decode_audio4 = dlsym(handle_codec, "avcodec_decode_audio4");
+ ff->av_init_packet = dlsym(handle_codec, "av_init_packet");
+ ff->av_free_packet = dlsym(handle_codec, "av_free_packet");
+--
+2.18.0
+
OpenPOWER on IntegriCloud