pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #291655 from jopejoe1/ffmpeg/small-improvements

ffmpeg: some more fixes and improvements

authored by Atemu and committed by GitHub 388041dc 4ea1e038

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