7.1 release

Author: nihil-admirari

.github/workflows/build.yml

@@ -162,16 +162,16 @@ jobs:
       fail-fast: false
       matrix:
         target: [win32,win64,winarm64]
-        variant: [gpl,gpl 7.0,gpl-shared,gpl-shared 7.0]
+        variant: [gpl,gpl 7.1,gpl-shared,gpl-shared 7.1]
         include:
           - target: linux64
             variant: gpl
           - target: linux64
-            variant: gpl 7.0
+            variant: gpl 7.1
           - target: linuxarm64
             variant: gpl
           - target: linuxarm64
-            variant: gpl 7.0
+            variant: gpl 7.1
     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 +236,16 @@ jobs:
       fail-fast: false
       matrix:
         target: [win32,win64,winarm64]
-        variant: [gpl,gpl 7.0,gpl-shared,gpl-shared 7.0]
+        variant: [gpl,gpl 7.1,gpl-shared,gpl-shared 7.1]
         include:
           - target: linux64
             variant: gpl
           - target: linux64
-            variant: gpl 7.0
+            variant: gpl 7.1
           - target: linuxarm64
             variant: gpl
           - target: linuxarm64
-            variant: gpl 7.0
+            variant: gpl 7.1
     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 7.0]
+        variant: [gpl-shared,gpl-shared 7.1]
         quickbuild: [1]
         include:
           - target: linux64
             variant: gpl
             quickbuild: ''
           - target: linux64
-            variant: gpl 7.0
+            variant: gpl 7.1
             quickbuild: ''
           - target: linuxarm64
             variant: gpl
             quickbuild: ''
           - target: linuxarm64
-            variant: gpl 7.0
+            variant: gpl 7.1
             quickbuild: ''
     steps:
       - name: Free Disk-Space

README.md

@@ -1,7 +1,7 @@
 # FFmpeg Static Auto-Builds
 
 
-This repository provides static Windows (x86 and x86_64) and Linux (x86_64, arm64) Builds of [FFmpeg master](https://github.com/FFmpeg/FFmpeg) and [latest release branch](https://github.com/FFmpeg/FFmpeg/tree/release/6.1) **with some patches necessary for smooth integration with [yt-dlp](https://github.com/yt-dlp/yt-dlp)**
+This repository provides static Windows (x86 and x86_64) and Linux (x86_64, arm64) Builds of [FFmpeg master](https://github.com/FFmpeg/FFmpeg) and [latest release branch](https://github.com/FFmpeg/FFmpeg/tree/release/7.1) **with some patches necessary for smooth integration with [yt-dlp](https://github.com/yt-dlp/yt-dlp)**
 
 **Note**: The builds provided are only meant to be used with yt-dlp and any unrelated issues/patches will be rejected
 

patches/ffmpeg/master/0001-Nonstandard-HEVC-over-FLV.patch

@@ -1,8 +1,8 @@
 diff --git a/libavformat/flv.h b/libavformat/flv.h
-index f710963..62297ed 100644
+index 1ea88ff..10c3101 100644
 --- a/libavformat/flv.h
 +++ b/libavformat/flv.h
-@@ -116,6 +116,7 @@ enum {
+@@ -117,6 +117,7 @@ enum {
      FLV_CODECID_H264    = 7,
      FLV_CODECID_REALH263= 8,
      FLV_CODECID_MPEG4   = 9,
@@ -11,31 +11,31 @@ index f710963..62297ed 100644
 
  enum {
 diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c
-index 22a9b9e..dfbdaa6 100644
+index 3173f01..f34886b 100644
 --- a/libavformat/flvdec.c
 +++ b/libavformat/flvdec.c
-@@ -335,6 +335,7 @@ static int flv_same_video_codec(AVCodecParameters *vpar, uint32_t flv_codecid)
+@@ -382,6 +382,7 @@ static int flv_same_video_codec(AVCodecParameters *vpar, uint32_t flv_codecid)
 
      switch (flv_codecid) {
      case MKBETAG('h', 'v', 'c', '1'):
 +    case FLV_CODECID_HEVC:
          return vpar->codec_id == AV_CODEC_ID_HEVC;
      case MKBETAG('a', 'v', '0', '1'):
          return vpar->codec_id == AV_CODEC_ID_AV1;
-@@ -367,6 +368,7 @@ static int flv_set_video_codec(AVFormatContext *s, AVStream *vstream,
+@@ -415,6 +416,7 @@ static int flv_set_video_codec(AVFormatContext *s, AVStream *vstream,
 
      switch (flv_codecid) {
      case MKBETAG('h', 'v', 'c', '1'):
 +    case FLV_CODECID_HEVC:
          par->codec_id = AV_CODEC_ID_HEVC;
          vstreami->need_parsing = AVSTREAM_PARSE_HEADERS;
          break;
-@@ -1463,7 +1465,7 @@ retry_duration:
-         }
+@@ -1655,7 +1657,7 @@ retry_duration:
 
-         if (st->codecpar->codec_id == AV_CODEC_ID_H264 || st->codecpar->codec_id == AV_CODEC_ID_MPEG4 ||
--            (st->codecpar->codec_id == AV_CODEC_ID_HEVC && type == PacketTypeCodedFrames)) {
-+            (st->codecpar->codec_id == AV_CODEC_ID_HEVC && (!enhanced_flv || type == PacketTypeCodedFrames))) {
-             // sign extension
-             int32_t cts = (avio_rb24(s->pb) + 0xff800000) ^ 0xff800000;
-             pts = av_sat_add64(dts, cts);
+             if (st->codecpar->codec_id == AV_CODEC_ID_MPEG4 ||
+                 (st->codecpar->codec_id == AV_CODEC_ID_H264 && (!enhanced_flv || type == PacketTypeCodedFrames)) ||
+-                (st->codecpar->codec_id == AV_CODEC_ID_HEVC && type == PacketTypeCodedFrames)) {
++                (st->codecpar->codec_id == AV_CODEC_ID_HEVC && (!enhanced_flv || type == PacketTypeCodedFrames))) {
+                 // sign extension
+                 int32_t cts = (avio_rb24(s->pb) + 0xff800000) ^ 0xff800000;
+                 pts = av_sat_add64(dts, cts);