7.0 release

Author: nihil-admirari

.github/workflows/build.yml

@@ -162,16 +162,21 @@ jobs:
       fail-fast: false
       matrix:
         target: [win32,win64,winarm64]
-        variant: [gpl,gpl 6.1,gpl-shared,gpl-shared 6.1]
+        variant: [gpl,gpl 7.0,gpl-shared,gpl-shared 7.0]
+        quickbuild: [1]
         include:
           - target: linux64
             variant: gpl
+            quickbuild: ''
           - target: linux64
-            variant: gpl 6.1
+            variant: gpl 7.0
+            quickbuild: ''
           - target: linuxarm64
             variant: gpl
+            quickbuild: ''
           - target: linuxarm64
-            variant: gpl 6.1
+            variant: gpl 7.0
+            quickbuild: ''
     steps:
       - name: Free Disk-Space
         run: df -h && sudo apt-get clean && docker system prune -a -f && sudo rm -rf /usr/local/lib/android /usr/share/dotnet /opt/ghc && df -h
@@ -236,16 +241,16 @@ jobs:
       fail-fast: false
       matrix:
         target: [win32,win64,winarm64]
-        variant: [gpl,gpl 6.1,gpl-shared,gpl-shared 6.1]
+        variant: [gpl,gpl 7.0,gpl-shared,gpl-shared 7.0]
         include:
           - target: linux64
             variant: gpl
           - target: linux64
-            variant: gpl 6.1
+            variant: gpl 7.0
           - target: linuxarm64
             variant: gpl
           - target: linuxarm64
-            variant: gpl 6.1
+            variant: gpl 7.0
     steps:
       - name: Free Disk-Space
         run: df -h && sudo apt-get clean && docker system prune -a -f && sudo rm -rf /usr/local/lib/android /usr/share/dotnet /opt/ghc && df -h

.github/workflows/pr.yml

@@ -18,20 +18,20 @@ jobs:
       fail-fast: false
       matrix:
         target: [win32,win64,winarm64]
-        variant: [gpl-shared,gpl-shared 6.1]
+        variant: [gpl-shared,gpl-shared 7.0]
         quickbuild: [1]
         include:
           - target: linux64
             variant: gpl
             quickbuild: ''
           - target: linux64
-            variant: gpl 6.1
+            variant: gpl 7.0
             quickbuild: ''
           - target: linuxarm64
             variant: gpl
             quickbuild: ''
           - target: linuxarm64
-            variant: gpl 6.1
+            variant: gpl 7.0
             quickbuild: ''
     steps:
       - name: Free Disk-Space

README.md

@@ -50,19 +50,15 @@ Fixes [yt-dlp#5874](https://github.com/yt-dlp/yt-dlp/issues/5874), [FFmpeg#6389]
 
 
 
+<!--
 ## Release-only patches
 Patches that have been merged in FFmpeg master, but not in FFmpeg's latest release:
+-->
 
-### 1. [WebVTT decoding fix](https://ffmpeg.org/pipermail/ffmpeg-devel/2022-May/296353.html)
-
-by [@tpikonen](https://github.com/tpikonen).
-Fixes [yt-dlp#4127](https://github.com/yt-dlp/yt-dlp/issues/4127), [FFmpeg#8684](https://trac.ffmpeg.org/ticket/8684)
-
-Fixed upstream by [@ztion](https://github.com/ztion); merged in [51d303e](https://github.com/FFmpeg/FFmpeg/commit/51d303e20cbb0874172f50b5172c515a973587d4).
 
 
 ## Historical Patches
-Patches that were used in the past but are no longer needed as of **6.1**:
+Patches that were used in the past but are no longer needed as of **7.0**:
 
 ### 1. [Fix AAC HLS streams being truncated mid stream](https://patchwork.ffmpeg.org/project/ffmpeg/patch/[email protected])
 
@@ -108,6 +104,13 @@ Fixes [FFmpeg#10482](https://trac.ffmpeg.org/ticket/10482)
 
 Fixed upstream by [@mkver](https://github.com/mkver); merged in [02064ba](https://github.com/FFmpeg/FFmpeg/commit/02064ba3a37754183cf7e7a4c1ffd3cdf971b5dc).
 
+### 5. [WebVTT decoding fix](https://ffmpeg.org/pipermail/ffmpeg-devel/2022-May/296353.html)
+
+by [@tpikonen](https://github.com/tpikonen).
+Fixes [yt-dlp#4127](https://github.com/yt-dlp/yt-dlp/issues/4127), [FFmpeg#8684](https://trac.ffmpeg.org/ticket/8684)
+
+Fixed upstream by [@ztion](https://github.com/ztion); merged in [51d303e](https://github.com/FFmpeg/FFmpeg/commit/51d303e20cbb0874172f50b5172c515a973587d4).
+
 
 
 ## Credits