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

ffmpeg-full: drop unneeded patch

Browse Source
This commit is contained in:
zowoq 2020-06-16 09:07:06 +10:00
parent f9e5ca8e58
commit 05c4c9e729
2 changed files with 0 additions and 21 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;