Skip to content

Commit 6d5d93c

Browse files
nihil-admirarigithub-actions[bot]
authored andcommitted
Patch for non-standard HEVC in FLV no longer needed on master
1 parent 621f266 commit 6d5d93c

File tree

2 files changed

+10
-53
lines changed

2 files changed

+10
-53
lines changed

README.md

+10-12
Original file line numberDiff line numberDiff line change
@@ -34,26 +34,24 @@ There are currently no MacOS builds. If you know how to add them to the workflow
3434

3535

3636

37+
<!--
3738
## Patches Applied
3839
These patches have been applied to the builds:
40+
-->
3941

40-
### 1. Decoding non-standard HEVC in FLV containers
41-
42-
HEVC inside FLV has been [standardized](https://github.com/veovera/enhanced-rtmp/blob/8c51d437e20a9199d92f24d9950b1216e07f065f/enhanced-rtmp.pdf) by [@Veovera](https://github.com/veovera), implemented by [@T-bagwell](https://github.com/T-bagwell) and merged to FFmpeg master in [aa83654](https://github.com/FFmpeg/FFmpeg/commit/aa83654d940e7599ee641fc5d0fcd10e7decf277) and [ac5cc66](https://github.com/FFmpeg/FFmpeg/commit/ac5cc66f9e4408c45c303f6bf482ff04d7cb355e).
43-
44-
Chinese sites seem to continue using an old non-standard way to deliver HEVC in FLV containers. These builds of FFmpeg support the decoding of such files.
4542

46-
Releases older than 6.1 also supported the encoding of such non-standard files. The implementation was assembled from patches by [@xiaoxial](https://github.com/VCDP/CDN/blob/master/FFmpeg_patches/0001-Add-SVT-HEVC-FLV-support-on-FFmpeg.patch), [@runner365](https://github.com/runner365/ffmpeg_rtmp_h265/blob/5.1/flvenc.c), and [Matthieu Patou](https://patchwork.ffmpeg.org/project/ffmpeg/patch/[email protected]/).
47-
See [this comment](https://github.com/yt-dlp/yt-dlp/pull/5823#issuecomment-1366868753) for details.
4843

49-
Fixes [yt-dlp#5874](https://github.com/yt-dlp/yt-dlp/issues/5874), [FFmpeg#6389](https://trac.ffmpeg.org/ticket/6389).
44+
## Release-only patches
45+
Patches that have been merged in FFmpeg master, but not in FFmpeg's latest release:
5046

47+
### 1. Decoding non-standard HEVC in FLV containers
5148

49+
by [@nihil-admirari](https://github.com/nihil-admirari).
50+
Fixes [yt-dlp#5874](https://github.com/yt-dlp/yt-dlp/issues/5874),
51+
[FFmpeg#6389](https://trac.ffmpeg.org/ticket/6389).
5252

53-
<!--
54-
## Release-only patches
55-
Patches that have been merged in FFmpeg master, but not in FFmpeg's latest release:
56-
-->
53+
Merged in
54+
[5cd49e1](https://github.com/FFmpeg/FFmpeg/commit/b76053d8bf322b197a9d07bd27bbdad14fd5bc15).
5755

5856

5957

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

-41
This file was deleted.

0 commit comments

Comments
 (0)