diff options
| author | Izorkin <izorkin@elven.pw> | 2021-07-05 13:59:30 +0300 |
|---|---|---|
| committer | Izorkin <izorkin@elven.pw> | 2021-07-05 19:21:27 +0300 |
| commit | ae8dd3c149b4d49e683f1414d417801b80b283e2 (patch) | |
| tree | 6d9de315d412161f35ea6ca06f36726e611a195d /pkgs/development/libraries/ffmpeg | |
| parent | 86a9eb52935411f9c560712969acab3ab8f74a7f (diff) | |
| download | nixpkgs-ae8dd3c149b4d49e683f1414d417801b80b283e2.tar nixpkgs-ae8dd3c149b4d49e683f1414d417801b80b283e2.tar.gz nixpkgs-ae8dd3c149b4d49e683f1414d417801b80b283e2.tar.bz2 nixpkgs-ae8dd3c149b4d49e683f1414d417801b80b283e2.tar.lz nixpkgs-ae8dd3c149b4d49e683f1414d417801b80b283e2.tar.xz nixpkgs-ae8dd3c149b4d49e683f1414d417801b80b283e2.tar.zst nixpkgs-ae8dd3c149b4d49e683f1414d417801b80b283e2.zip | |
ffmpeg_4: fix incorrect segment length in hls
Diffstat (limited to 'pkgs/development/libraries/ffmpeg')
| -rw-r--r-- | pkgs/development/libraries/ffmpeg/4.nix | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/pkgs/development/libraries/ffmpeg/4.nix b/pkgs/development/libraries/ffmpeg/4.nix index df3d0732393..d557c87ebdf 100644 --- a/pkgs/development/libraries/ffmpeg/4.nix +++ b/pkgs/development/libraries/ffmpeg/4.nix @@ -2,6 +2,7 @@ # Darwin frameworks , Cocoa, CoreMedia, VideoToolbox , stdenv, lib +, fetchpatch , ... }@args: @@ -11,7 +12,18 @@ callPackage ./generic.nix (rec { sha256 = "03kxc29y8190k4y8s8qdpsghlbpmchv1m8iqygq2qn0vfm4ka2a2"; darwinFrameworks = [ Cocoa CoreMedia VideoToolbox ]; - /* Work around https://trac.ffmpeg.org/ticket/9242 */ - patches = lib.optional stdenv.isDarwin - ./v2-0001-avcodec-videotoolboxenc-define-TARGET_CPU_ARM64-t.patch; + patches = [ + # Fix incorrect segment length in HLS child playlist with fmp4 segment format + # FIXME remove in version 4.5 + # https://trac.ffmpeg.org/ticket/9193 + # https://trac.ffmpeg.org/ticket/9205 + (fetchpatch { + name = "ffmpeg_fix_incorrect_segment_length_in_hls.patch"; + url = "https://git.videolan.org/?p=ffmpeg.git;a=commitdiff_plain;h=59032494e81a1a65c0b960aaae7ec4c2cc9db35a"; + sha256 = "03zz1lw51kkc3g3vh47xa5hfiz3g3g1rbrll3kcnslvwylmrqmy3"; + }) + ] ++ lib.optionals stdenv.isDarwin [ + # Work around https://trac.ffmpeg.org/ticket/9242 + ./v2-0001-avcodec-videotoolboxenc-define-TARGET_CPU_ARM64-t.patch + ]; } // args) |