From 49a1646d48682bafef0445e804b443dce7753a20 Mon Sep 17 00:00:00 2001 From: Markham Date: Sun, 4 Aug 2024 13:41:11 +0200 Subject: [PATCH] bump version ffmpeg-6.1.2 --- .../ffmpeg-arm/{6.1.1 => 6.1.2}/0001-ffmpeg-nolog.patch | 0 .../ffmpeg-arm/{6.1.1 => 6.1.2}/0002-fix-mpegts.patch | 0 .../0003-allow-to-choose-rtmp-impl-at-runtime.patch | 0 .../{6.1.1 => 6.1.2}/0004-hls-replace-key-uri.patch | 0 .../{6.1.1 => 6.1.2}/0005-mips64-cpu-detection.patch | 0 .../ffmpeg-arm/{6.1.1 => 6.1.2}/0006-optimize-aac.patch | 0 .../{6.1.1 => 6.1.2}/0007-increase-buffer-size.patch | 0 .../{6.1.1 => 6.1.2}/0008-recheck-discard-flags.patch | 0 .../{6.1.1 => 6.1.2}/0009-ffmpeg-fix-edit-list-parsing.patch | 0 .../ffmpeg-arm/{6.1.1 => 6.1.2}/0010-ffmpeg-replay_dash.patch | 0 archive-patches/ffmpeg-arm/{6.1.1 => 6.1.2}/0011-rtsp.patch | 0 archive-patches/ffmpeg-arm/{6.1.1 => 6.1.2}/0012-dxva2.patch | 0 .../0013-add-av_stream_get_first_dts-for-chromium.patch | 0 .../ffmpeg-arm/{6.1.1 => 6.1.2}/0014-ffmpeg-whitelist.patch | 0 .../{6.1.1 => 6.1.2}/0015-ffmpeg-support-kid-key.patch | 0 .../ffmpeg-cst/{6.1.1 => 6.1.2}/0001-ffmpeg-nolog.patch | 0 .../ffmpeg-cst/{6.1.1 => 6.1.2}/0002-fix-mpegts.patch | 0 .../0003-allow-to-choose-rtmp-impl-at-runtime.patch | 0 .../{6.1.1 => 6.1.2}/0004-hls-replace-key-uri.patch | 0 .../{6.1.1 => 6.1.2}/0005-mips64-cpu-detection.patch | 0 .../ffmpeg-cst/{6.1.1 => 6.1.2}/0006-optimize-aac.patch | 0 .../{6.1.1 => 6.1.2}/0007-increase-buffer-size.patch | 0 .../{6.1.1 => 6.1.2}/0008-recheck-discard-flags.patch | 0 .../{6.1.1 => 6.1.2}/0009-ffmpeg-fix-edit-list-parsing.patch | 0 .../ffmpeg-cst/{6.1.1 => 6.1.2}/0010-ffmpeg-replay_dash.patch | 0 archive-patches/ffmpeg-cst/{6.1.1 => 6.1.2}/0011-rtsp.patch | 0 archive-patches/ffmpeg-cst/{6.1.1 => 6.1.2}/0012-dxva2.patch | 0 .../0013-add-av_stream_get_first_dts-for-chromium.patch | 0 .../ffmpeg-cst/{6.1.1 => 6.1.2}/0014-ffmpeg-whitelist.patch | 0 .../{6.1.1 => 6.1.2}/0015-ffmpeg-support-kid-key.patch | 0 .../{6.1.1 => 6.1.2}/0016-fixparentheses-warning.patch | 0 ...20-cst-add-ASF-VC1-Annex-G-and-RCV-bitstream-filters.patch | 0 .../{6.1.1 => 6.1.2}/0021-cst-fix-h264-sps-pps.patch | 0 make/versions.mk | 4 ++-- 34 files changed, 2 insertions(+), 2 deletions(-) rename archive-patches/ffmpeg-arm/{6.1.1 => 6.1.2}/0001-ffmpeg-nolog.patch (100%) rename archive-patches/ffmpeg-arm/{6.1.1 => 6.1.2}/0002-fix-mpegts.patch (100%) rename archive-patches/ffmpeg-arm/{6.1.1 => 6.1.2}/0003-allow-to-choose-rtmp-impl-at-runtime.patch (100%) rename archive-patches/ffmpeg-arm/{6.1.1 => 6.1.2}/0004-hls-replace-key-uri.patch (100%) rename archive-patches/ffmpeg-arm/{6.1.1 => 6.1.2}/0005-mips64-cpu-detection.patch (100%) rename archive-patches/ffmpeg-arm/{6.1.1 => 6.1.2}/0006-optimize-aac.patch (100%) rename archive-patches/ffmpeg-arm/{6.1.1 => 6.1.2}/0007-increase-buffer-size.patch (100%) rename archive-patches/ffmpeg-arm/{6.1.1 => 6.1.2}/0008-recheck-discard-flags.patch (100%) rename archive-patches/ffmpeg-arm/{6.1.1 => 6.1.2}/0009-ffmpeg-fix-edit-list-parsing.patch (100%) rename archive-patches/ffmpeg-arm/{6.1.1 => 6.1.2}/0010-ffmpeg-replay_dash.patch (100%) rename archive-patches/ffmpeg-arm/{6.1.1 => 6.1.2}/0011-rtsp.patch (100%) rename archive-patches/ffmpeg-arm/{6.1.1 => 6.1.2}/0012-dxva2.patch (100%) rename archive-patches/ffmpeg-arm/{6.1.1 => 6.1.2}/0013-add-av_stream_get_first_dts-for-chromium.patch (100%) rename archive-patches/ffmpeg-arm/{6.1.1 => 6.1.2}/0014-ffmpeg-whitelist.patch (100%) rename archive-patches/ffmpeg-arm/{6.1.1 => 6.1.2}/0015-ffmpeg-support-kid-key.patch (100%) rename archive-patches/ffmpeg-cst/{6.1.1 => 6.1.2}/0001-ffmpeg-nolog.patch (100%) rename archive-patches/ffmpeg-cst/{6.1.1 => 6.1.2}/0002-fix-mpegts.patch (100%) rename archive-patches/ffmpeg-cst/{6.1.1 => 6.1.2}/0003-allow-to-choose-rtmp-impl-at-runtime.patch (100%) rename archive-patches/ffmpeg-cst/{6.1.1 => 6.1.2}/0004-hls-replace-key-uri.patch (100%) rename archive-patches/ffmpeg-cst/{6.1.1 => 6.1.2}/0005-mips64-cpu-detection.patch (100%) rename archive-patches/ffmpeg-cst/{6.1.1 => 6.1.2}/0006-optimize-aac.patch (100%) rename archive-patches/ffmpeg-cst/{6.1.1 => 6.1.2}/0007-increase-buffer-size.patch (100%) rename archive-patches/ffmpeg-cst/{6.1.1 => 6.1.2}/0008-recheck-discard-flags.patch (100%) rename archive-patches/ffmpeg-cst/{6.1.1 => 6.1.2}/0009-ffmpeg-fix-edit-list-parsing.patch (100%) rename archive-patches/ffmpeg-cst/{6.1.1 => 6.1.2}/0010-ffmpeg-replay_dash.patch (100%) rename archive-patches/ffmpeg-cst/{6.1.1 => 6.1.2}/0011-rtsp.patch (100%) rename archive-patches/ffmpeg-cst/{6.1.1 => 6.1.2}/0012-dxva2.patch (100%) rename archive-patches/ffmpeg-cst/{6.1.1 => 6.1.2}/0013-add-av_stream_get_first_dts-for-chromium.patch (100%) rename archive-patches/ffmpeg-cst/{6.1.1 => 6.1.2}/0014-ffmpeg-whitelist.patch (100%) rename archive-patches/ffmpeg-cst/{6.1.1 => 6.1.2}/0015-ffmpeg-support-kid-key.patch (100%) rename archive-patches/ffmpeg-cst/{6.1.1 => 6.1.2}/0016-fixparentheses-warning.patch (100%) rename archive-patches/ffmpeg-cst/{6.1.1 => 6.1.2}/0020-cst-add-ASF-VC1-Annex-G-and-RCV-bitstream-filters.patch (100%) rename archive-patches/ffmpeg-cst/{6.1.1 => 6.1.2}/0021-cst-fix-h264-sps-pps.patch (100%) diff --git a/archive-patches/ffmpeg-arm/6.1.1/0001-ffmpeg-nolog.patch b/archive-patches/ffmpeg-arm/6.1.2/0001-ffmpeg-nolog.patch similarity index 100% rename from archive-patches/ffmpeg-arm/6.1.1/0001-ffmpeg-nolog.patch rename to archive-patches/ffmpeg-arm/6.1.2/0001-ffmpeg-nolog.patch diff --git a/archive-patches/ffmpeg-arm/6.1.1/0002-fix-mpegts.patch b/archive-patches/ffmpeg-arm/6.1.2/0002-fix-mpegts.patch similarity index 100% rename from archive-patches/ffmpeg-arm/6.1.1/0002-fix-mpegts.patch rename to archive-patches/ffmpeg-arm/6.1.2/0002-fix-mpegts.patch diff --git a/archive-patches/ffmpeg-arm/6.1.1/0003-allow-to-choose-rtmp-impl-at-runtime.patch b/archive-patches/ffmpeg-arm/6.1.2/0003-allow-to-choose-rtmp-impl-at-runtime.patch similarity index 100% rename from archive-patches/ffmpeg-arm/6.1.1/0003-allow-to-choose-rtmp-impl-at-runtime.patch rename to archive-patches/ffmpeg-arm/6.1.2/0003-allow-to-choose-rtmp-impl-at-runtime.patch diff --git a/archive-patches/ffmpeg-arm/6.1.1/0004-hls-replace-key-uri.patch b/archive-patches/ffmpeg-arm/6.1.2/0004-hls-replace-key-uri.patch similarity index 100% rename from archive-patches/ffmpeg-arm/6.1.1/0004-hls-replace-key-uri.patch rename to archive-patches/ffmpeg-arm/6.1.2/0004-hls-replace-key-uri.patch diff --git a/archive-patches/ffmpeg-arm/6.1.1/0005-mips64-cpu-detection.patch b/archive-patches/ffmpeg-arm/6.1.2/0005-mips64-cpu-detection.patch similarity index 100% rename from archive-patches/ffmpeg-arm/6.1.1/0005-mips64-cpu-detection.patch rename to archive-patches/ffmpeg-arm/6.1.2/0005-mips64-cpu-detection.patch diff --git a/archive-patches/ffmpeg-arm/6.1.1/0006-optimize-aac.patch b/archive-patches/ffmpeg-arm/6.1.2/0006-optimize-aac.patch similarity index 100% rename from archive-patches/ffmpeg-arm/6.1.1/0006-optimize-aac.patch rename to archive-patches/ffmpeg-arm/6.1.2/0006-optimize-aac.patch diff --git a/archive-patches/ffmpeg-arm/6.1.1/0007-increase-buffer-size.patch b/archive-patches/ffmpeg-arm/6.1.2/0007-increase-buffer-size.patch similarity index 100% rename from archive-patches/ffmpeg-arm/6.1.1/0007-increase-buffer-size.patch rename to archive-patches/ffmpeg-arm/6.1.2/0007-increase-buffer-size.patch diff --git a/archive-patches/ffmpeg-arm/6.1.1/0008-recheck-discard-flags.patch b/archive-patches/ffmpeg-arm/6.1.2/0008-recheck-discard-flags.patch similarity index 100% rename from archive-patches/ffmpeg-arm/6.1.1/0008-recheck-discard-flags.patch rename to archive-patches/ffmpeg-arm/6.1.2/0008-recheck-discard-flags.patch diff --git a/archive-patches/ffmpeg-arm/6.1.1/0009-ffmpeg-fix-edit-list-parsing.patch b/archive-patches/ffmpeg-arm/6.1.2/0009-ffmpeg-fix-edit-list-parsing.patch similarity index 100% rename from archive-patches/ffmpeg-arm/6.1.1/0009-ffmpeg-fix-edit-list-parsing.patch rename to archive-patches/ffmpeg-arm/6.1.2/0009-ffmpeg-fix-edit-list-parsing.patch diff --git a/archive-patches/ffmpeg-arm/6.1.1/0010-ffmpeg-replay_dash.patch b/archive-patches/ffmpeg-arm/6.1.2/0010-ffmpeg-replay_dash.patch similarity index 100% rename from archive-patches/ffmpeg-arm/6.1.1/0010-ffmpeg-replay_dash.patch rename to archive-patches/ffmpeg-arm/6.1.2/0010-ffmpeg-replay_dash.patch diff --git a/archive-patches/ffmpeg-arm/6.1.1/0011-rtsp.patch b/archive-patches/ffmpeg-arm/6.1.2/0011-rtsp.patch similarity index 100% rename from archive-patches/ffmpeg-arm/6.1.1/0011-rtsp.patch rename to archive-patches/ffmpeg-arm/6.1.2/0011-rtsp.patch diff --git a/archive-patches/ffmpeg-arm/6.1.1/0012-dxva2.patch b/archive-patches/ffmpeg-arm/6.1.2/0012-dxva2.patch similarity index 100% rename from archive-patches/ffmpeg-arm/6.1.1/0012-dxva2.patch rename to archive-patches/ffmpeg-arm/6.1.2/0012-dxva2.patch diff --git a/archive-patches/ffmpeg-arm/6.1.1/0013-add-av_stream_get_first_dts-for-chromium.patch b/archive-patches/ffmpeg-arm/6.1.2/0013-add-av_stream_get_first_dts-for-chromium.patch similarity index 100% rename from archive-patches/ffmpeg-arm/6.1.1/0013-add-av_stream_get_first_dts-for-chromium.patch rename to archive-patches/ffmpeg-arm/6.1.2/0013-add-av_stream_get_first_dts-for-chromium.patch diff --git a/archive-patches/ffmpeg-arm/6.1.1/0014-ffmpeg-whitelist.patch b/archive-patches/ffmpeg-arm/6.1.2/0014-ffmpeg-whitelist.patch similarity index 100% rename from archive-patches/ffmpeg-arm/6.1.1/0014-ffmpeg-whitelist.patch rename to archive-patches/ffmpeg-arm/6.1.2/0014-ffmpeg-whitelist.patch diff --git a/archive-patches/ffmpeg-arm/6.1.1/0015-ffmpeg-support-kid-key.patch b/archive-patches/ffmpeg-arm/6.1.2/0015-ffmpeg-support-kid-key.patch similarity index 100% rename from archive-patches/ffmpeg-arm/6.1.1/0015-ffmpeg-support-kid-key.patch rename to archive-patches/ffmpeg-arm/6.1.2/0015-ffmpeg-support-kid-key.patch diff --git a/archive-patches/ffmpeg-cst/6.1.1/0001-ffmpeg-nolog.patch b/archive-patches/ffmpeg-cst/6.1.2/0001-ffmpeg-nolog.patch similarity index 100% rename from archive-patches/ffmpeg-cst/6.1.1/0001-ffmpeg-nolog.patch rename to archive-patches/ffmpeg-cst/6.1.2/0001-ffmpeg-nolog.patch diff --git a/archive-patches/ffmpeg-cst/6.1.1/0002-fix-mpegts.patch b/archive-patches/ffmpeg-cst/6.1.2/0002-fix-mpegts.patch similarity index 100% rename from archive-patches/ffmpeg-cst/6.1.1/0002-fix-mpegts.patch rename to archive-patches/ffmpeg-cst/6.1.2/0002-fix-mpegts.patch diff --git a/archive-patches/ffmpeg-cst/6.1.1/0003-allow-to-choose-rtmp-impl-at-runtime.patch b/archive-patches/ffmpeg-cst/6.1.2/0003-allow-to-choose-rtmp-impl-at-runtime.patch similarity index 100% rename from archive-patches/ffmpeg-cst/6.1.1/0003-allow-to-choose-rtmp-impl-at-runtime.patch rename to archive-patches/ffmpeg-cst/6.1.2/0003-allow-to-choose-rtmp-impl-at-runtime.patch diff --git a/archive-patches/ffmpeg-cst/6.1.1/0004-hls-replace-key-uri.patch b/archive-patches/ffmpeg-cst/6.1.2/0004-hls-replace-key-uri.patch similarity index 100% rename from archive-patches/ffmpeg-cst/6.1.1/0004-hls-replace-key-uri.patch rename to archive-patches/ffmpeg-cst/6.1.2/0004-hls-replace-key-uri.patch diff --git a/archive-patches/ffmpeg-cst/6.1.1/0005-mips64-cpu-detection.patch b/archive-patches/ffmpeg-cst/6.1.2/0005-mips64-cpu-detection.patch similarity index 100% rename from archive-patches/ffmpeg-cst/6.1.1/0005-mips64-cpu-detection.patch rename to archive-patches/ffmpeg-cst/6.1.2/0005-mips64-cpu-detection.patch diff --git a/archive-patches/ffmpeg-cst/6.1.1/0006-optimize-aac.patch b/archive-patches/ffmpeg-cst/6.1.2/0006-optimize-aac.patch similarity index 100% rename from archive-patches/ffmpeg-cst/6.1.1/0006-optimize-aac.patch rename to archive-patches/ffmpeg-cst/6.1.2/0006-optimize-aac.patch diff --git a/archive-patches/ffmpeg-cst/6.1.1/0007-increase-buffer-size.patch b/archive-patches/ffmpeg-cst/6.1.2/0007-increase-buffer-size.patch similarity index 100% rename from archive-patches/ffmpeg-cst/6.1.1/0007-increase-buffer-size.patch rename to archive-patches/ffmpeg-cst/6.1.2/0007-increase-buffer-size.patch diff --git a/archive-patches/ffmpeg-cst/6.1.1/0008-recheck-discard-flags.patch b/archive-patches/ffmpeg-cst/6.1.2/0008-recheck-discard-flags.patch similarity index 100% rename from archive-patches/ffmpeg-cst/6.1.1/0008-recheck-discard-flags.patch rename to archive-patches/ffmpeg-cst/6.1.2/0008-recheck-discard-flags.patch diff --git a/archive-patches/ffmpeg-cst/6.1.1/0009-ffmpeg-fix-edit-list-parsing.patch b/archive-patches/ffmpeg-cst/6.1.2/0009-ffmpeg-fix-edit-list-parsing.patch similarity index 100% rename from archive-patches/ffmpeg-cst/6.1.1/0009-ffmpeg-fix-edit-list-parsing.patch rename to archive-patches/ffmpeg-cst/6.1.2/0009-ffmpeg-fix-edit-list-parsing.patch diff --git a/archive-patches/ffmpeg-cst/6.1.1/0010-ffmpeg-replay_dash.patch b/archive-patches/ffmpeg-cst/6.1.2/0010-ffmpeg-replay_dash.patch similarity index 100% rename from archive-patches/ffmpeg-cst/6.1.1/0010-ffmpeg-replay_dash.patch rename to archive-patches/ffmpeg-cst/6.1.2/0010-ffmpeg-replay_dash.patch diff --git a/archive-patches/ffmpeg-cst/6.1.1/0011-rtsp.patch b/archive-patches/ffmpeg-cst/6.1.2/0011-rtsp.patch similarity index 100% rename from archive-patches/ffmpeg-cst/6.1.1/0011-rtsp.patch rename to archive-patches/ffmpeg-cst/6.1.2/0011-rtsp.patch diff --git a/archive-patches/ffmpeg-cst/6.1.1/0012-dxva2.patch b/archive-patches/ffmpeg-cst/6.1.2/0012-dxva2.patch similarity index 100% rename from archive-patches/ffmpeg-cst/6.1.1/0012-dxva2.patch rename to archive-patches/ffmpeg-cst/6.1.2/0012-dxva2.patch diff --git a/archive-patches/ffmpeg-cst/6.1.1/0013-add-av_stream_get_first_dts-for-chromium.patch b/archive-patches/ffmpeg-cst/6.1.2/0013-add-av_stream_get_first_dts-for-chromium.patch similarity index 100% rename from archive-patches/ffmpeg-cst/6.1.1/0013-add-av_stream_get_first_dts-for-chromium.patch rename to archive-patches/ffmpeg-cst/6.1.2/0013-add-av_stream_get_first_dts-for-chromium.patch diff --git a/archive-patches/ffmpeg-cst/6.1.1/0014-ffmpeg-whitelist.patch b/archive-patches/ffmpeg-cst/6.1.2/0014-ffmpeg-whitelist.patch similarity index 100% rename from archive-patches/ffmpeg-cst/6.1.1/0014-ffmpeg-whitelist.patch rename to archive-patches/ffmpeg-cst/6.1.2/0014-ffmpeg-whitelist.patch diff --git a/archive-patches/ffmpeg-cst/6.1.1/0015-ffmpeg-support-kid-key.patch b/archive-patches/ffmpeg-cst/6.1.2/0015-ffmpeg-support-kid-key.patch similarity index 100% rename from archive-patches/ffmpeg-cst/6.1.1/0015-ffmpeg-support-kid-key.patch rename to archive-patches/ffmpeg-cst/6.1.2/0015-ffmpeg-support-kid-key.patch diff --git a/archive-patches/ffmpeg-cst/6.1.1/0016-fixparentheses-warning.patch b/archive-patches/ffmpeg-cst/6.1.2/0016-fixparentheses-warning.patch similarity index 100% rename from archive-patches/ffmpeg-cst/6.1.1/0016-fixparentheses-warning.patch rename to archive-patches/ffmpeg-cst/6.1.2/0016-fixparentheses-warning.patch diff --git a/archive-patches/ffmpeg-cst/6.1.1/0020-cst-add-ASF-VC1-Annex-G-and-RCV-bitstream-filters.patch b/archive-patches/ffmpeg-cst/6.1.2/0020-cst-add-ASF-VC1-Annex-G-and-RCV-bitstream-filters.patch similarity index 100% rename from archive-patches/ffmpeg-cst/6.1.1/0020-cst-add-ASF-VC1-Annex-G-and-RCV-bitstream-filters.patch rename to archive-patches/ffmpeg-cst/6.1.2/0020-cst-add-ASF-VC1-Annex-G-and-RCV-bitstream-filters.patch diff --git a/archive-patches/ffmpeg-cst/6.1.1/0021-cst-fix-h264-sps-pps.patch b/archive-patches/ffmpeg-cst/6.1.2/0021-cst-fix-h264-sps-pps.patch similarity index 100% rename from archive-patches/ffmpeg-cst/6.1.1/0021-cst-fix-h264-sps-pps.patch rename to archive-patches/ffmpeg-cst/6.1.2/0021-cst-fix-h264-sps-pps.patch diff --git a/make/versions.mk b/make/versions.mk index e9477be..82419fc 100644 --- a/make/versions.mk +++ b/make/versions.mk @@ -79,11 +79,11 @@ FBSHOT_VER = 0.3 # FFMPEG | A complete, cross-platform solution to record, convert and stream audio and video ifeq ($(BOXTYPE), armbox) #FFMPEG_VER = 5.1.2 -FFMPEG_VER = 6.1.1 +FFMPEG_VER = 6.1.2 else ifeq ($(BOXTYPE), coolstream) #FFMPEG_GIT = 2ba896f #FFMPEG_VER = 3.3 -FFMPEG_VER = 6.1.1 +FFMPEG_VER = 6.1.2 endif # FLAC stands for Free Lossless Audio Codec, an audio format similar to MP3, but lossless, meaning that audio is compressed in FLAC without any loss in quality -- 2.39.5