Compare commits
3 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
cb8b75595f | ||
|
|
cde4f15f76 | ||
|
c00c27c8fd |
5 changed files with 68 additions and 39 deletions
|
|
@ -1,3 +1,5 @@
|
|||
From: Andreas Schneider <asn@cryptomilk.org>
|
||||
|
||||
fdk-aac-free-devel is GPL compatible
|
||||
|
||||
See https://bugzilla.redhat.com/show_bug.cgi?id=1501522#c112
|
||||
|
|
|
|||
46
ffmpeg-chromium.patch
Normal file
46
ffmpeg-chromium.patch
Normal file
|
|
@ -0,0 +1,46 @@
|
|||
From 4464ecf750bb9440e2571a8d810627cdec85ae02 Mon Sep 17 00:00:00 2001
|
||||
From: Frank Liberato <liberato@chromium.org>
|
||||
Date: Wed, 7 Jul 2021 19:01:22 -0700
|
||||
Subject: [PATCH] Add av_stream_get_first_dts for Chromium
|
||||
|
||||
---
|
||||
libavformat/avformat.h | 4 ++++
|
||||
libavformat/utils.c | 7 +++++++
|
||||
2 files changed, 11 insertions(+)
|
||||
|
||||
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
|
||||
index f12fa7d904..0b9fd1f061 100644
|
||||
--- a/libavformat/avformat.h
|
||||
+++ b/libavformat/avformat.h
|
||||
@@ -1128,6 +1128,10 @@ struct AVCodecParserContext *av_stream_get_parser(const AVStream *s);
|
||||
*/
|
||||
int64_t av_stream_get_end_pts(const AVStream *st);
|
||||
|
||||
+// Chromium: We use the internal field first_dts vvv
|
||||
+int64_t av_stream_get_first_dts(const AVStream *st);
|
||||
+// Chromium: We use the internal field first_dts ^^^
|
||||
+
|
||||
#define AV_PROGRAM_RUNNING 1
|
||||
|
||||
/**
|
||||
diff --git a/libavformat/utils.c b/libavformat/utils.c
|
||||
index cf4d68bff9..7d750abf88 100644
|
||||
--- a/libavformat/utils.c
|
||||
+++ b/libavformat/utils.c
|
||||
@@ -55,6 +55,13 @@ int ff_unlock_avformat(void)
|
||||
return ff_mutex_unlock(&avformat_mutex) ? -1 : 0;
|
||||
}
|
||||
|
||||
+// Chromium: We use the internal field first_dts vvv
|
||||
+int64_t av_stream_get_first_dts(const AVStream *st)
|
||||
+{
|
||||
+ return cffstream(st)->first_dts;
|
||||
+}
|
||||
+// Chromium: We use the internal field first_dts ^^^
|
||||
+
|
||||
/* an arbitrarily chosen "sane" max packet size -- 50M */
|
||||
#define SANE_CHUNK_SIZE (50000000)
|
||||
|
||||
--
|
||||
2.41.0
|
||||
|
||||
|
|
@ -1,32 +0,0 @@
|
|||
From: Lynne <dev@lynne.ee>
|
||||
Date: Sun, 25 Dec 2022 00:03:30 +0000 (+0100)
|
||||
Subject: hwcontext_vulkan: remove optional encode/decode extensions from the list
|
||||
X-Git-Url: http://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/eb0455d64690eed0068e5cb202f72ecdf899837c
|
||||
|
||||
hwcontext_vulkan: remove optional encode/decode extensions from the list
|
||||
|
||||
They're not currently used, so they don't need to be there.
|
||||
Vulkan stabilized the decode extensions less than a week ago, and their
|
||||
name prefixes were changed from EXT to KHR. It's a bit too soon to be
|
||||
depending on it, so rather than bumping, just remove these for now.
|
||||
---
|
||||
|
||||
diff --git a/libavutil/hwcontext_vulkan.c b/libavutil/hwcontext_vulkan.c
|
||||
index f1db1c7291..2a9b5f4aac 100644
|
||||
--- a/libavutil/hwcontext_vulkan.c
|
||||
+++ b/libavutil/hwcontext_vulkan.c
|
||||
@@ -358,14 +358,6 @@ static const VulkanOptExtension optional_device_exts[] = {
|
||||
{ VK_KHR_EXTERNAL_MEMORY_WIN32_EXTENSION_NAME, FF_VK_EXT_EXTERNAL_WIN32_MEMORY },
|
||||
{ VK_KHR_EXTERNAL_SEMAPHORE_WIN32_EXTENSION_NAME, FF_VK_EXT_EXTERNAL_WIN32_SEM },
|
||||
#endif
|
||||
-
|
||||
- /* Video encoding/decoding */
|
||||
- { VK_KHR_VIDEO_QUEUE_EXTENSION_NAME, FF_VK_EXT_NO_FLAG },
|
||||
- { VK_KHR_VIDEO_DECODE_QUEUE_EXTENSION_NAME, FF_VK_EXT_NO_FLAG },
|
||||
- { VK_KHR_VIDEO_ENCODE_QUEUE_EXTENSION_NAME, FF_VK_EXT_NO_FLAG },
|
||||
- { VK_EXT_VIDEO_ENCODE_H264_EXTENSION_NAME, FF_VK_EXT_NO_FLAG },
|
||||
- { VK_EXT_VIDEO_DECODE_H264_EXTENSION_NAME, FF_VK_EXT_NO_FLAG },
|
||||
- { VK_EXT_VIDEO_DECODE_H265_EXTENSION_NAME, FF_VK_EXT_NO_FLAG },
|
||||
};
|
||||
|
||||
/* Converts return values to strings */
|
||||
23
ffmpeg.spec
23
ffmpeg.spec
|
|
@ -101,8 +101,8 @@
|
|||
Name: ffmpeg
|
||||
%global pkg_name %{name}%{?pkg_suffix}
|
||||
|
||||
Version: 5.1.2
|
||||
Release: 12%{?dist}
|
||||
Version: 5.1.4
|
||||
Release: 1%{?dist}
|
||||
Summary: A complete solution to record, convert and stream audio and video
|
||||
License: GPLv3+
|
||||
URL: https://ffmpeg.org/
|
||||
|
|
@ -128,12 +128,16 @@ Patch2: ffmpeg-new-coder-errors.patch
|
|||
# Allow to build with fdk-aac-free
|
||||
# See https://bugzilla.redhat.com/show_bug.cgi?id=1501522#c112
|
||||
Patch3: ffmpeg-allow-fdk-aac-free.patch
|
||||
# Upstream fix for vulkan-headers 1.3.236.0+
|
||||
Patch4: ffmpeg-vulkan-headers.patch
|
||||
|
||||
# Set up dlopen for openh264
|
||||
Patch1001: ffmpeg-dlopen-openh264.patch
|
||||
|
||||
# Add first_dts getter to libavformat for Chromium
|
||||
# See: https://bugzilla.redhat.com/show_bug.cgi?id=2240127
|
||||
# Reference: https://crbug.com/1306560
|
||||
Patch1002: ffmpeg-chromium.patch
|
||||
|
||||
|
||||
Requires: libavcodec%{?pkg_suffix}%{_isa} = %{version}-%{release}
|
||||
Requires: libavdevice%{?pkg_suffix}%{_isa} = %{version}-%{release}
|
||||
Requires: libavfilter%{?pkg_suffix}%{_isa} = %{version}-%{release}
|
||||
|
|
@ -150,6 +154,7 @@ BuildRequires: flite-devel >= 2.2
|
|||
%endif
|
||||
BuildRequires: game-music-emu-devel
|
||||
BuildRequires: gcc
|
||||
BuildRequires: git-core
|
||||
BuildRequires: gnupg2
|
||||
BuildRequires: gsm-devel
|
||||
BuildRequires: ladspa-devel
|
||||
|
|
@ -554,7 +559,7 @@ This subpackage contains the headers for FFmpeg libswscale.
|
|||
gpgv2 --quiet --keyring %{SOURCE3} %{SOURCE2} %{SOURCE0}
|
||||
%endif
|
||||
|
||||
%autosetup -a1 -p1
|
||||
%autosetup -a1 -S git_am
|
||||
install -m 0644 %{SOURCE20} enable_decoders
|
||||
install -m 0644 %{SOURCE21} enable_encoders
|
||||
# fix -O3 -g in host_cflags
|
||||
|
|
@ -870,6 +875,14 @@ rm -rf %{buildroot}%{_datadir}/%{name}/examples
|
|||
%{_mandir}/man3/libswscale.3*
|
||||
|
||||
%changelog
|
||||
* Tue Nov 14 2023 Neal Gompa <ngompa@fedoraproject.org> - 5.1.4-1
|
||||
- Update to 5.1.4
|
||||
- Add ffmpeg chromium support patch (#2240127)
|
||||
- Use git to apply patches
|
||||
|
||||
* Tue Mar 28 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 5.1.3-1
|
||||
- Update to 5.1.3
|
||||
|
||||
* Wed Feb 15 2023 Neal Gompa <ngompa@fedoraproject.org> - 5.1.2-12
|
||||
- Enable support for the RIST protocol through librist
|
||||
|
||||
|
|
|
|||
4
sources
4
sources
|
|
@ -1,4 +1,4 @@
|
|||
SHA512 (ffmpeg-free-5.1.2.tar.xz) = 8dfb1b8a7d60357abbb21b38526ece67efec38cb52c01ed03b540d350ac82576ce68de3294a4cc6f166c36defa3933e2f9d4652b290e167bf8b6f220921e1e50
|
||||
SHA512 (ffmpeg-5.1.2.tar.xz.asc) = 6afc898e3898a7d34e21f0f0bd0553765a46257332c6ece6226e3e043b842275a8d885b9ccca34bc90a2f008ae5fa14515276d23f921a518a63a47f6504af115
|
||||
SHA512 (ffmpeg-free-5.1.4.tar.xz) = 73365770b6049528d08fb199de30d61c31327f050d66d87876d26388cc85feaae5c2f1cad6b06f34c7fbb28a1dff0df55d15653f7f5e216e9662cfe902bd8d5a
|
||||
SHA512 (ffmpeg-5.1.4.tar.xz.asc) = f161815d47c988f8b6281a95f22301d07a22ddc41a2a84bfc126b4d7de0e9175da499c2cc15b3bdaa415af0e8ed1d2b4d52096a81b4a3d804effb00ff9e8ec5b
|
||||
SHA512 (ffmpeg-dlopen-headers.tar.xz) = 97e6986fc2bb9dfa4516135a76b04d27ceb52ff96f0af21a6169919aeefefb4d2e2e24a771959689cdbec385f5d71614ba661223c67c0e94089a6dd823a30099
|
||||
SHA512 (ffmpeg.keyring) = 9b36506835db36f776b7ddb53ad6fa9e915e6ca2f9c7cfebe8eb45513e1036a985283590a840ca313a111bf35dc3731f68885aaafb1fb7011ec433cc119e5165
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue