Leigh Scott
4 years ago
parent
5dcb87b1ea
commit
08c92d47d2
@ -1,46 +0,0 @@
|
||||
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
|
||||
|
||||
@ -1,34 +0,0 @@
|
||||
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
|
||||
|
||||
@ -1,38 +0,0 @@
|
||||
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
|
||||
|
||||
@ -1,37 +0,0 @@
|
||||
From 7ba6fc7408b5fb46c698e17471d12dd53d5685ec Mon Sep 17 00:00:00 2001
|
||||
From: reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>
|
||||
Date: Sun, 1 Nov 2020 15:07:44 +0000
|
||||
Subject: [PATCH] ad_spdif: Use avformat_free_context to free context.
|
||||
|
||||
This avoids memleaks and in newest FFmpeg versions also
|
||||
compile errors.
|
||||
|
||||
git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@38199 b3059339-0415-0410-9bf9-f77b7e298cf2
|
||||
---
|
||||
libmpcodecs/ad_spdif.c | 10 ++--------
|
||||
1 file changed, 2 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/libmpcodecs/ad_spdif.c b/libmpcodecs/ad_spdif.c
|
||||
index 1fc237b..8ee4724 100644
|
||||
--- a/libmpcodecs/ad_spdif.c
|
||||
+++ b/libmpcodecs/ad_spdif.c
|
||||
@@ -298,14 +298,8 @@ static void uninit(sh_audio_t *sh)
|
||||
if (spdif_ctx->header_written)
|
||||
av_write_trailer(lavf_ctx);
|
||||
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);
|
||||
- av_freep(&lavf_ctx->priv_data);
|
||||
+ avformat_free_context(lavf_ctx);
|
||||
+ lavf_ctx = NULL;
|
||||
}
|
||||
- av_freep(&lavf_ctx);
|
||||
av_freep(&spdif_ctx);
|
||||
}
|
||||
--
|
||||
2.7.4
|
||||
|
||||
@ -1,2 +1 @@
|
||||
de7b4438b68729089d92912f041abe54 Blue-1.11.tar.bz2
|
||||
58d39f72bf7f3ddaa9e019224bffcb74 MPlayer-1.4.tar.xz
|
||||
SHA512 (mplayer-export-2021-03-13.tar.xz) = d9a423e7d4ef8346f5944e8f0aab0dea4415aa85ff0fea0ff119fdbd48c1a7c683bd5e17f3efc1b7d3bced50466584456de615e2d312019958beabcc0694b4fe
|
||||
|
||||
Loading…
Reference in new issue