From 1e7fead1d5f2bdeffd2a70f9441bf28a52f190cc Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Mon, 26 Feb 2024 20:52:15 +0100 Subject: [PATCH] ffmpeg: add second opencore amr option withOpencoreAmrnb only adds AMR-NB de/encoder also add adding withOpencoreAmrwb to also support AMR-WB decoder --- pkgs/development/libraries/ffmpeg/generic.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index d30d107470de..1f9fb446cf4e 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -63,7 +63,8 @@ , withOgg ? withHeadlessDeps # Ogg container used by vorbis & theora , withOpenal ? withFullDeps # OpenAL 1.1 capture support , withOpencl ? withFullDeps -, withOpencoreAmrnb ? withFullDeps && withVersion3 # AMR-NB de/encoder & AMR-WB decoder +, withOpencoreAmrnb ? withFullDeps && withVersion3 # AMR-NB de/encoder +, withOpencoreAmrwb ? withFullDeps && withVersion3 # AMR-WB decoder , withOpengl ? false # OpenGL rendering , withOpenh264 ? withFullDeps # H.264/AVC encoder , withOpenjpeg ? withFullDeps # JPEG 2000 de/encoder @@ -511,6 +512,7 @@ stdenv.mkDerivation (finalAttrs: { (enableFeature withOpenal "openal") (enableFeature withOpencl "opencl") (enableFeature withOpencoreAmrnb "libopencore-amrnb") + (enableFeature withOpencoreAmrwb "libopencore-amrwb") (enableFeature withOpengl "opengl") (enableFeature withOpenh264 "libopenh264") (enableFeature withOpenjpeg "libopenjpeg") @@ -625,7 +627,7 @@ stdenv.mkDerivation (finalAttrs: { ++ optionals withOgg [ libogg ] ++ optionals withOpenal [ openal ] ++ optionals withOpencl [ ocl-icd opencl-headers ] - ++ optionals withOpencoreAmrnb [ opencore-amr ] + ++ optionals (withOpencoreAmrnb || withOpencoreAmrwb) [ opencore-amr ] ++ optionals withOpengl [ libGL libGLU ] ++ optionals withOpenh264 [ openh264 ] ++ optionals withOpenjpeg [ openjpeg ]