commit 5a24c2d187492fe94a869158b8a6430c2529e613 Author: Leigh Scott <leigh123linux(a)gmail.com&gt; Date: Fri Apr 17 07:44:21 2020 +0100 Add AV1 support ...ecs.conf-Add-AV1-decoder-dav1d-via-FFmpeg.patch | 46 ++++++++++++++++++++++ ...odecs.conf-Add-AOM-AV1-decoder-via-FFmpeg.patch | 34 ++++++++++++++++ 0003-codecs.conf-Bump-version.patch | 38 ++++++++++++++++++ mplayer.spec | 15 +++++-- 4 files changed, 130 insertions(+), 3 deletions(-) --- diff --git a/0001-codecs.conf-Add-AV1-decoder-dav1d-via-FFmpeg.patch b/0001-codecs.conf-Add-AV1-decoder-dav1d-via-FFmpeg.patch new file mode 100644 index 0000000..6d2b2af --- /dev/null +++ b/0001-codecs.conf-Add-AV1-decoder-dav1d-via-FFmpeg.patch @@ -0,0 +1,46 @@ +From 03e10eabcd7b72c3730ca75ffe5276db2b7de1b6 Mon Sep 17 00:00:00 2001 +From: al <al@b3059339-0415-0410-9bf9-f77b7e298cf2> +Date: Tue, 24 Dec 2019 10:41:24 +0000 +Subject: [PATCH 1/5] codecs.conf: Add AV1 decoder dav1d via FFmpeg + +Thanks to + +* Andrew-R (in ticket #2355) +* Sylvain (on mplayer-dev-eng ml) +* Carl Eugen Hoyos (in private communication) + +You all provided helpful patches, suggestions and comments! + +Fixes part of ticket #2355 + + + +git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@38155 b3059339-0415-0410-9bf9-f77b7e298cf2 +--- + etc/codecs.conf | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/etc/codecs.conf b/etc/codecs.conf +index 8b3db9797..a0757c79d 100644 +--- a/etc/codecs.conf ++++ b/etc/codecs.conf +@@ -8,6 +8,16 @@ release 20111012 + ;============================================================================= + ; VIDEO CODECS + ;============================================================================= ++videocodec fflibdav1d ++ info "FFmpeg wrapper for libdav1d" ++ status working ++ fourcc AV01,av01 ++ driver ffmpeg ++ dll libdav1d ++ out YV12,420P10,420P12 ++ out 422P,422P10,422P12 ++ out 444P,444P10,444P12 ++ out GBR24P,GBR10P,GBR12P + + videocodec ffiff + info "FFmpeg IFF ANIM/ILBM/PBM/RGB8/RGBN" +-- +2.26.0 + diff --git a/0002-codecs.conf-Add-AOM-AV1-decoder-via-FFmpeg.patch b/0002-codecs.conf-Add-AOM-AV1-decoder-via-FFmpeg.patch new file mode 100644 index 0000000..719f4ab --- /dev/null +++ b/0002-codecs.conf-Add-AOM-AV1-decoder-via-FFmpeg.patch @@ -0,0 +1,34 @@ +From 327dd40996e0eb671c3f6cdcdc429d9a7be25187 Mon Sep 17 00:00:00 2001 +From: al <al@b3059339-0415-0410-9bf9-f77b7e298cf2> +Date: Tue, 24 Dec 2019 10:43:45 +0000 +Subject: [PATCH 2/5] codecs.conf: Add AOM AV1 decoder via FFmpeg + +git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@38156 b3059339-0415-0410-9bf9-f77b7e298cf2 +--- + etc/codecs.conf | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/etc/codecs.conf b/etc/codecs.conf +index a0757c79d..fa8f1fedb 100644 +--- a/etc/codecs.conf ++++ b/etc/codecs.conf +@@ -19,6 +19,16 @@ videocodec fflibdav1d + out 444P,444P10,444P12 + out GBR24P,GBR10P,GBR12P + ++videocodec fflibaomav1 ++ info "FFmpeg wrapper for libaom/AV1" ++ status working ++ fourcc AV01,av01 ++ driver ffmpeg ++ dll libaom-av1 ++ out YV12,420P10,420P12 ++ out 422P,422P10,422P12 ++ out 444P,444P10,444P12 ++ + videocodec ffiff + info "FFmpeg IFF ANIM/ILBM/PBM/RGB8/RGBN" + status working +-- +2.26.0 + diff --git a/0003-codecs.conf-Bump-version.patch b/0003-codecs.conf-Bump-version.patch new file mode 100644 index 0000000..1c5752b --- /dev/null +++ b/0003-codecs.conf-Bump-version.patch @@ -0,0 +1,38 @@ +From 667b86fb135c4ee16a3dc1978c170c42b43a0ae3 Mon Sep 17 00:00:00 2001 +From: al <al@b3059339-0415-0410-9bf9-f77b7e298cf2> +Date: Tue, 24 Dec 2019 10:46:23 +0000 +Subject: [PATCH 3/5] codecs.conf: Bump version + +In SVN r38154 , ffmpeg12vdpau was removed and ffmpeg1vdpau and +ffmpeg2vdpau were added as replacement. + +In previous commits AV1 codecs were added, and a lot more changes +were done in 8 years. + +Bump codecs.conf, so users with a customized codecs.conf based on +an older version will fallback to the internal version and get a +message about having an outdated codecs.conf lying around. + + + +git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@38157 b3059339-0415-0410-9bf9-f77b7e298cf2 +--- + etc/codecs.conf | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/etc/codecs.conf b/etc/codecs.conf +index fa8f1fedb..f4ff4425b 100644 +--- a/etc/codecs.conf ++++ b/etc/codecs.conf +@@ -3,7 +3,7 @@ + ; Before editing this file, please read DOCS/tech/codecs.conf.txt ! + ;============================================================================= + +-release 20111012 ++release 20191203 + + ;============================================================================= + ; VIDEO CODECS +-- +2.26.0 + diff --git a/mplayer.spec b/mplayer.spec index 4317c38..47cff9d 100644 --- a/mplayer.spec +++ b/mplayer.spec @@ -6,9 +6,9 @@ Name: mplayer Version: 1.4 %if 0%{?svn} -Release: 8{?pre:.%{pre}}%{?dist} +Release: 9{?pre:.%{pre}}%{?dist} %else -Release: 8%{?dist} +Release: 9%{?dist} %endif Summary: Movie player playing most video formats and DVDs @@ -33,6 +33,9 @@ Patch1: %{name}-manlinks.patch # use system FFmpeg libraries Patch3: %{name}-ffmpeg.patch +Patch4: 0001-codecs.conf-Add-AV1-decoder-dav1d-via-FFmpeg.patch +Patch5: 0002-codecs.conf-Add-AOM-AV1-decoder-via-FFmpeg.patch +Patch6: 0003-codecs.conf-Bump-version.patch BuildRequires: SDL-devel BuildRequires: a52dec-devel @@ -225,6 +228,9 @@ rm -rf ffmpeg %patch0 -p1 -b .config %patch1 -p1 -b .manlinks %patch3 -p1 -b .ffmpeg +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 mkdir GUI cp -a `ls -1|grep -v GUI` GUI/ @@ -309,7 +315,7 @@ sed -i '1s:#!/usr/bin/env python:#!/usr/bin/env python2:' %{buildroot}%{_bindir} %find_lang %{name} --with-man %find_lang mencoder --with-man -%if 0%{?rhel} +%if (0%{?rhel} && 0%{?rhel} <= 7) %post /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : @@ -373,6 +379,9 @@ fi %{_datadir}/mplayer/*.fp %changelog +* Fri Apr 17 2020 Leigh Scott <leigh123linux(a)gmail.com&gt; - 1.4-9 +- Add AV1 support + * Fri Apr 10 2020 Leigh Scott <leigh123linux(a)gmail.com&gt; - 1.4-8 - Rebuild for new libcdio version