pyrox.dev
Merge pull request #291655 from jopejoe1/ffmpeg/small-improvements
ffmpeg: some more fixes and improvements
+9
-4
pkgs/development/libraries/ffmpeg/generic.nix
+9
-4
pkgs/development/libraries/ffmpeg/generic.nix
···
40
40
, withDav1d ? withHeadlessDeps # AV1 decoder (focused on speed and correctness)
41
41
, withDc1394 ? withFullDeps && !stdenv.isDarwin # IIDC-1394 grabbing (ieee 1394)
42
42
, withDrm ? withHeadlessDeps && (with stdenv; isLinux || isFreeBSD) # libdrm support
43
-
, withFdkAac ? withFullDeps && withUnfree # Fraunhofer FDK AAC de/encoder
43
+
, withFdkAac ? withFullDeps && (!withGPL || withUnfree) # Fraunhofer FDK AAC de/encoder
44
44
, withFlite ? withFullDeps # Voice Synthesis
45
45
, withFontconfig ? withHeadlessDeps # Needed for drawtext filter
46
46
, withFreetype ? withHeadlessDeps # Needed for drawtext filter
···
63
63
, withOgg ? withHeadlessDeps # Ogg container used by vorbis & theora
64
64
, withOpenal ? withFullDeps # OpenAL 1.1 capture support
65
65
, withOpencl ? withFullDeps
66
-
, withOpencoreAmrnb ? withFullDeps && withVersion3 # AMR-NB de/encoder & AMR-WB decoder
66
+
, withOpencoreAmrnb ? withFullDeps && withVersion3 # AMR-NB de/encoder
67
+
, withOpencoreAmrwb ? withFullDeps && withVersion3 # AMR-WB decoder
67
68
, withOpengl ? false # OpenGL rendering
68
69
, withOpenh264 ? withFullDeps # H.264/AVC encoder
69
70
, withOpenjpeg ? withFullDeps # JPEG 2000 de/encoder
···
476
477
(enableFeature withBluray "libbluray")
477
478
(enableFeature withBs2b "libbs2b")
478
479
(enableFeature withBzlib "bzlib")
480
+
(enableFeature withCaca "libcaca")
479
481
(enableFeature withCelt "libcelt")
480
482
(enableFeature withChromaprint "chromaprint")
481
483
(enableFeature withCuda "cuda")
···
486
488
(enableFeature withFdkAac "libfdk-aac")
487
489
(enableFeature withFlite "libflite")
488
490
(enableFeature withFontconfig "fontconfig")
491
+
(enableFeature withFontconfig "libfontconfig")
489
492
(enableFeature withFreetype "libfreetype")
490
493
(enableFeature withFrei0r "frei0r")
491
494
(enableFeature withFribidi "libfribidi")
···
509
512
(enableFeature withOpenal "openal")
510
513
(enableFeature withOpencl "opencl")
511
514
(enableFeature withOpencoreAmrnb "libopencore-amrnb")
515
+
(enableFeature withOpencoreAmrwb "libopencore-amrwb")
512
516
(enableFeature withOpengl "opengl")
513
517
(enableFeature withOpenh264 "libopenh264")
514
518
(enableFeature withOpenjpeg "libopenjpeg")
···
588
592
nativeBuildInputs = [ removeReferencesTo addOpenGLRunpath perl pkg-config texinfo yasm ]
589
593
++ optionals withCudaLLVM [ clang ];
590
594
591
-
buildInputs = optionals (withNvdec || withNvenc) [ (if (lib.versionAtLeast finalAttrs.version "6") then nv-codec-headers-12 else nv-codec-headers) ]
595
+
buildInputs = []
592
596
++ optionals withAlsa [ alsa-lib ]
593
597
++ optionals withAom [ libaom ]
594
598
++ optionals withAribcaption [ libaribcaption ]
···
620
624
++ optionals withModplug [ libmodplug ]
621
625
++ optionals withMp3lame [ lame ]
622
626
++ optionals withMysofa [ libmysofa ]
627
+
++ optionals (withNvdec || withNvenc) [ (if (lib.versionAtLeast finalAttrs.version "6") then nv-codec-headers-12 else nv-codec-headers) ]
623
628
++ optionals withOgg [ libogg ]
624
629
++ optionals withOpenal [ openal ]
625
630
++ optionals withOpencl [ ocl-icd opencl-headers ]
626
-
++ optionals withOpencoreAmrnb [ opencore-amr ]
631
+
++ optionals (withOpencoreAmrnb || withOpencoreAmrwb) [ opencore-amr ]
627
632
++ optionals withOpengl [ libGL libGLU ]
628
633
++ optionals withOpenh264 [ openh264 ]
629
634
++ optionals withOpenjpeg [ openjpeg ]