aboutsummaryrefslogtreecommitdiff
path: root/repos/extra/ffmpeg/ffmpeg-6.0-chromium_method-1.patch
diff options
context:
space:
mode:
authoremmett1 <emmett1.2miligrams@protonmail.com>2024-06-17 22:50:16 +0800
committeremmett1 <emmett1.2miligrams@protonmail.com>2024-06-17 22:50:16 +0800
commit8d5f3549f7c2826ff4e35b31f6ce55179ebc70e9 (patch)
tree778925c58e70b035e9cfe9a12e345d1ddd3dbb61 /repos/extra/ffmpeg/ffmpeg-6.0-chromium_method-1.patch
parente7a05bccb4e979eb70b15defa583ef81cabed9e0 (diff)
downloadalicelinux-8d5f3549f7c2826ff4e35b31f6ce55179ebc70e9.tar.gz
alicelinux-8d5f3549f7c2826ff4e35b31f6ce55179ebc70e9.zip
updates
Diffstat (limited to 'repos/extra/ffmpeg/ffmpeg-6.0-chromium_method-1.patch')
-rw-r--r--repos/extra/ffmpeg/ffmpeg-6.0-chromium_method-1.patch42
1 files changed, 0 insertions, 42 deletions
diff --git a/repos/extra/ffmpeg/ffmpeg-6.0-chromium_method-1.patch b/repos/extra/ffmpeg/ffmpeg-6.0-chromium_method-1.patch
deleted file mode 100644
index 9aee44a5..00000000
--- a/repos/extra/ffmpeg/ffmpeg-6.0-chromium_method-1.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Submitted By: Marty Jack (martyj19 at comcast dot net)
-Date: 2022-07-23
-Initial Package Version: 5.1.0
-Origin: Rediffed from ffmpeg-5.0.1-api_addition-1.patch
-Upstream Status: Not accepted
-Description: The ffmpeg upstream is not willing to take this as a
-permanent fix and suggests that Chromium should change to keep the
-information locally to Chromium. Until that happens it appears
-that many distros are carrying this patch as a temporary
-expedient to allow building with system ffmpeg.
-
-diff -Naur ffmpeg-5.1.orig/libavformat/avformat.h ffmpeg-5.1/libavformat/avformat.h
---- ffmpeg-5.1.orig/libavformat/avformat.h 2022-07-22 13:58:39.000000000 -0400
-+++ ffmpeg-5.1/libavformat/avformat.h 2022-07-22 19:34:07.490051886 -0400
-@@ -1128,6 +1128,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 -Naur ffmpeg-5.1.orig/libavformat/demux_utils.c ffmpeg-5.1/libavformat/demux_utils.c
---- ffmpeg-5.1.orig/libavformat/demux_utils.c 2022-07-22 13:58:39.000000000 -0400
-+++ ffmpeg-5.1/libavformat/demux_utils.c 2022-07-22 19:36:39.646735587 -0400
-@@ -29,6 +29,13 @@
- #include "demux.h"
- #include "internal.h"
-
-+// 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;