From 8fe3b50bf79c0bf49254276d7045a0f769ab88a1 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Tue, 8 Mar 2022 09:49:23 -0500 Subject: [PATCH] Drop ffmpeg chromium support patch (#2061392) --- ffmpeg-support-chromium.patch | 42 ----------------------------------- ffmpeg.spec | 9 ++++---- 2 files changed, 5 insertions(+), 46 deletions(-) delete mode 100644 ffmpeg-support-chromium.patch diff --git a/ffmpeg-support-chromium.patch b/ffmpeg-support-chromium.patch deleted file mode 100644 index 8e9a0ac..0000000 --- a/ffmpeg-support-chromium.patch +++ /dev/null @@ -1,42 +0,0 @@ -commit 95aab0fd83619408995720ce53d7a74790580220 -author liberato@chromium.org Thu Jul 08 02:01:22 2021 -committer liberato@chromium.org Thu Jul 08 02:01:22 2021 -tree ac725b5e2c548c8142aa7096d8184d87d3876a49 -parent e073b7a22e4993e0a7cab80a42a21524e5349f95 - -Add av_stream_get_first_dts for Chromium - -diff --git a/libavformat/avformat.h b/libavformat/avformat.h -index cd7b0d9..b4a6dce 100644 ---- a/libavformat/avformat.h -+++ b/libavformat/avformat.h -@@ -1010,6 +1010,10 @@ - */ - 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 de7580c..0ef0fe5 100644 ---- a/libavformat/utils.c -+++ b/libavformat/utils.c -@@ -121,6 +121,13 @@ - return AV_NOPTS_VALUE; - } - -+// 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 ^^^ -+ - struct AVCodecParserContext *av_stream_get_parser(const AVStream *st) - { - return cffstream(st)->parser; - diff --git a/ffmpeg.spec b/ffmpeg.spec index 9ce2234..2787a84 100644 --- a/ffmpeg.spec +++ b/ffmpeg.spec @@ -69,7 +69,7 @@ Name: ffmpeg %global pkg_name %{name}%{?pkg_suffix} Version: 5.0 -Release: 8%{?dist} +Release: 9%{?dist} Summary: A complete solution to record, convert and stream audio and video License: GPLv3+ URL: https://ffmpeg.org/ @@ -101,10 +101,8 @@ Patch4: ffmpeg-new-coder-errors.patch Patch5: ffmpeg-allow-fdk-aac-free.patch # http://ffmpeg.org/pipermail/ffmpeg-devel/2022-February/292853.html Patch6: ffmpeg-fix-gnutls-priority.patch -# https://ffmpeg.org/pipermail/ffmpeg-devel/2021-September/285401.html -Patch7: ffmpeg-support-chromium.patch # http://ffmpeg.org/pipermail/ffmpeg-devel/2022-February/293194.html -Patch8: ffmpeg-openh264-averr-on-bad-version.patch +Patch7: ffmpeg-openh264-averr-on-bad-version.patch # Set up dlopen for openh264 Patch1001: ffmpeg-dlopen-openh264.patch @@ -820,6 +818,9 @@ rm -rf %{buildroot}%{_datadir}/%{name}/examples %{_mandir}/man3/libswscale.3* %changelog +* Tue Mar 08 2022 Neal Gompa - 5.0-9 +- Drop ffmpeg chromium support patch (#2061392) + * Fri Feb 18 2022 Neal Gompa - 5.0-8 - Add patch to return correct AVERROR with bad OpenH264 versions