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 18ef841..6b5b17d 100644 --- a/ffmpeg.spec +++ b/ffmpeg.spec @@ -130,7 +130,7 @@ Source0: ffmpeg-%{?branch}%{date}.tar.bz2 Source0: http://ffmpeg.org/releases/ffmpeg-%{version}.tar.xz %endif Patch0: fix-vmaf-model-path.patch -Patch1: ffmpeg-support-chromium.patch +# upstream asm commits Requires: %{name}-libs%{?_isa} = %{version}-%{release} # Fedora dev's decided to conflict with our package Provides: %{name}-free%{?_isa} = 100:%{version}-%{release}