[gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/files/, media-video/mplayer/

["Alexis Ballier" <aballier@gentoo.org>]

commit:     c9f197136f2ba5cf2ff546197f66aec6bb4033d2
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Fri Apr  9 13:00:47 2021 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Fri Apr  9 13:00:58 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9f19713

media-video/mplayer: fix build with ffmpeg 4.4

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>

 media-video/mplayer/files/ffmpeg44.patch  | 12 ++++++++++++
 media-video/mplayer/mplayer-1.4-r1.ebuild |  1 +
 2 files changed, 13 insertions(+)

diff --git a/media-video/mplayer/files/ffmpeg44.patch b/media-video/mplayer/files/ffmpeg44.patch
new file mode 100644
index 00000000000..99d54079cab
--- /dev/null
+++ b/media-video/mplayer/files/ffmpeg44.patch
@@ -0,0 +1,12 @@
+Index: MPlayer-1.4/libmpcodecs/ad_spdif.c
+===================================================================
+--- MPlayer-1.4.orig/libmpcodecs/ad_spdif.c
++++ MPlayer-1.4/libmpcodecs/ad_spdif.c
+@@ -300,7 +300,6 @@ static void uninit(sh_audio_t *sh)
+         av_freep(&lavf_ctx->pb);
+         if (lavf_ctx->streams) {
+             av_freep(&lavf_ctx->streams[0]->codec);
+-            av_freep(&lavf_ctx->streams[0]->info);
+             av_freep(&lavf_ctx->streams[0]);
+         }
+         av_freep(&lavf_ctx->streams);

diff --git a/media-video/mplayer/mplayer-1.4-r1.ebuild b/media-video/mplayer/mplayer-1.4-r1.ebuild
index c3f5a2e913c..e3f376cc706 100644
--- a/media-video/mplayer/mplayer-1.4-r1.ebuild
+++ b/media-video/mplayer/mplayer-1.4-r1.ebuild
@@ -232,6 +232,7 @@ src_prepare() {
 	else
 		eapply "${FILESDIR}"/${PN}-1.3-CVE-2016-4352.patch
 	fi
+	eapply "${FILESDIR}"/ffmpeg44.patch
 	if [ ! -f VERSION ] ; then
 		[ -f "$svf" ] || die "Missing ${svf}. Did you generate your snapshot with prepare_mplayer.sh?"
 		local sv=$(<$svf)