public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #90541 from zowoq/ffmpeg43

Browse Source 
ffmpeg: 4.2.3 -> 4.3
This commit is contained in:
zowoq 2020-06-19 09:32:37 +10:00 committed by GitHub
commit 3e0b8c5a70
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/libraries/ffmpeg-full/default.nix
View File

@ -242,8 +242,6 @@ stdenv.mkDerivation rec {
pname = "ffmpeg-full"; pname = "ffmpeg-full";
inherit (ffmpeg) src version; inherit (ffmpeg) src version;
patches = [ ./prefer-libdav1d-over-libaom.patch ];
prePatch = '' prePatch = ''
patchShebangs . patchShebangs .
'' + stdenv.lib.optionalString stdenv.isDarwin '' '' + stdenv.lib.optionalString stdenv.isDarwin ''

19
pkgs/development/libraries/ffmpeg-full/prefer-libdav1d-over-libaom.patch
View File

@ -1,19 +0,0 @@
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
index d2f9a39ce5..2342399a8e 100644
--- a/libavcodec/allcodecs.c
+++ b/libavcodec/allcodecs.c
@@ -679,13 +679,13 @@ extern AVCodec ff_pcm_mulaw_at_encoder;
extern AVCodec ff_pcm_mulaw_at_decoder;
extern AVCodec ff_qdmc_at_decoder;
extern AVCodec ff_qdm2_at_decoder;
+extern AVCodec ff_libdav1d_decoder;
extern AVCodec ff_libaom_av1_decoder;
extern AVCodec ff_libaom_av1_encoder;
extern AVCodec ff_libaribb24_decoder;
extern AVCodec ff_libcelt_decoder;
extern AVCodec ff_libcodec2_encoder;
extern AVCodec ff_libcodec2_decoder;
-extern AVCodec ff_libdav1d_decoder;
extern AVCodec ff_libdavs2_decoder;
extern AVCodec ff_libfdk_aac_encoder;
extern AVCodec ff_libfdk_aac_decoder;

6
pkgs/development/libraries/ffmpeg/4.nix
View File

@ -5,8 +5,8 @@
}@args: }@args:
callPackage ./generic.nix (rec { callPackage ./generic.nix (rec {
version = "4.2.3"; version = "4.3";
branch = "4.2"; branch = "4.3";
sha256 = "0pkrariwjv25k7inwshch7b5820ly3hsp991amyb60rkqc8v4zi1"; sha256 = "1qnnhd2b0g5sg72pclxs3i8sxzz0raky69k7w9cmpba9zh973s57";
darwinFrameworks = [ Cocoa CoreMedia VideoToolbox ]; darwinFrameworks = [ Cocoa CoreMedia VideoToolbox ];
} // args) } // args)

4
pkgs/development/libraries/nv-codec-headers/default.nix
View File

@ -2,12 +2,12 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "nv-codec-headers"; pname = "nv-codec-headers";
version = "9.0.18.1"; version = "9.1.23.1";
src = fetchgit { src = fetchgit {
url = "https://git.videolan.org/git/ffmpeg/nv-codec-headers.git"; url = "https://git.videolan.org/git/ffmpeg/nv-codec-headers.git";
rev = "n${version}"; rev = "n${version}";
sha256 = "0354fivb92ix341jds7a7qn3mgwimrnxbganhlhr4vayj25c3hw5"; sha256 = "1xfvb3mhz6wfx9c732888xa82ivaig903lhvvrqqzs31qfznsplh";
}; };
makeFlags = [ "PREFIX=$(out)" ]; makeFlags = [ "PREFIX=$(out)" ];