forked from mirrors/nixpkgs
Merge #25382: ffmpeg: remove darwin patch
This commit is contained in:
commit
ba4fd61630
|
@ -9,5 +9,4 @@ callPackage ./generic.nix (args // rec {
|
|||
branch = "3.3";
|
||||
sha256 = "1p3brx0qa3i3569zlmcmpbxf17q73nrmbx2vp39s8h77r53qdq11";
|
||||
darwinFrameworks = [ Cocoa CoreMedia ];
|
||||
patches = stdenv.lib.optional stdenv.isDarwin ./sdk_detection.patch;
|
||||
})
|
||||
|
|
|
@ -1,12 +0,0 @@
|
|||
diff --git a/libavcodec/audiotoolboxdec.c b/libavcodec/audiotoolboxdec.c
|
||||
--- a/libavcodec/audiotoolboxdec.c
|
||||
+++ b/libavcodec/audiotoolboxdec.c
|
||||
@@ -32,7 +32,7 @@
|
||||
#include "libavutil/opt.h"
|
||||
#include "libavutil/log.h"
|
||||
|
||||
-#ifndef __MAC_10_11
|
||||
+#if __MAC_OS_X_VERSION_MIN_REQUIRED < 101100
|
||||
#define kAudioFormatEnhancedAC3 'ec-3'
|
||||
#endif
|
||||
|
Loading…
Reference in a new issue