From aebab6d7210b3284aae63a2ce01c7523fea1efd0 Mon Sep 17 00:00:00 2001 From: Owen Rafferty Date: Sat, 11 Mar 2023 16:02:44 -0600 Subject: [PATCH] ffmpeg: 6.0 --- extra/ffmpeg/checksums | 4 ++-- ...-av_stream_get_first_dts-for-chromium.patch | 18 +++++++----------- extra/ffmpeg/sources | 2 +- extra/ffmpeg/version | 2 +- 4 files changed, 11 insertions(+), 15 deletions(-) diff --git a/extra/ffmpeg/checksums b/extra/ffmpeg/checksums index 2ac523ec..c3f5a423 100644 --- a/extra/ffmpeg/checksums +++ b/extra/ffmpeg/checksums @@ -1,2 +1,2 @@ -69fddb793c6b4fb6fd1093e54c8228c3c498614be3e48c311bb3f609a12daf5f5f -258454e4c47cd21c00528ff536fa263c06fce69ea59c9a09a908cc6f72ae060b4e +4879074c357102f85932673044c57c144b0c188ae58edec2a115965536ee340f5e +4f16712641b400498753572c0f2d1e30f28fa0df0ea8d0bd2da9d2d74f6613b3ee diff --git a/extra/ffmpeg/patches/add-av_stream_get_first_dts-for-chromium.patch b/extra/ffmpeg/patches/add-av_stream_get_first_dts-for-chromium.patch index 88af308e..0dc9c509 100644 --- a/extra/ffmpeg/patches/add-av_stream_get_first_dts-for-chromium.patch +++ b/extra/ffmpeg/patches/add-av_stream_get_first_dts-for-chromium.patch @@ -1,32 +1,28 @@ diff --git a/libavformat/avformat.h b/libavformat/avformat.h -index f12fa7d..0b9fd1f 100644 +index 1916aa2..43aa2dd 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h -@@ -1128,6 +1128,10 @@ struct AVCodecParserContext *av_stream_get_parser(const AVStream *s); - */ +@@ -1019,6 +1019,8 @@ attribute_deprecated int64_t av_stream_get_end_pts(const AVStream *st); + #endif -+// 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/mux_utils.c b/libavformat/mux_utils.c -index eb8ea3d..8420934 100644 +index 3e63b80..758d985 100644 --- a/libavformat/mux_utils.c +++ b/libavformat/mux_utils.c -@@ -37,6 +37,13 @@ int64_t av_stream_get_end_pts(const AVStream *st) - return AV_NOPTS_VALUE; +@@ -40,6 +40,11 @@ int64_t av_stream_get_end_pts(const AVStream *st) } + #endif -+// Chromium: We use the internal field first_dts vvv +int64_t av_stream_get_first_dts(const AVStream *st) +{ -+ return cffstream(st)->first_dts; ++ return cffstream(st)->first_dts; +} -+// Chromium: We use the internal field first_dts ^^^ + int avformat_query_codec(const AVOutputFormat *ofmt, enum AVCodecID codec_id, int std_compliance) diff --git a/extra/ffmpeg/sources b/extra/ffmpeg/sources index 5c83c002..eb6e1dfb 100644 --- a/extra/ffmpeg/sources +++ b/extra/ffmpeg/sources @@ -1,2 +1,2 @@ -https://ffmpeg.org/releases/ffmpeg-5.1.2.tar.xz +https://ffmpeg.org/releases/ffmpeg-6.0.tar.xz patches/add-av_stream_get_first_dts-for-chromium.patch diff --git a/extra/ffmpeg/version b/extra/ffmpeg/version index 27b49972..384681ba 100644 --- a/extra/ffmpeg/version +++ b/extra/ffmpeg/version @@ -1 +1 @@ -5.1.2 2 +6.0 1