mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-23 13:48:21 +03:00
ffmpeg: fix bad merge
This commit is contained in:
parent
e3da83297f
commit
b1a8ae2a35
@ -1,7 +1,7 @@
|
||||
{ stdenv, fetchurl, pkgconfig, perl, texinfo, yasm
|
||||
, alsaLib, bzip2, fontconfig, freetype, gnutls, libiconv, lame, libass, libogg
|
||||
, libtheora, libva, libvorbis, libvpx, lzma, libpulseaudio, soxr
|
||||
, x264, xvidcore, zlib, libopus, SDL
|
||||
, x264, xvidcore, zlib, libopus
|
||||
, openglSupport ? false, mesa ? null
|
||||
# Build options
|
||||
, runtimeCpuDetectBuild ? true # Detect CPU capabilities at runtime
|
||||
|
Loading…
Reference in New Issue
Block a user