John Ericson 4ccb74011f Merge commit '18aa59b0f26fc707e7313f8467e67159e61600c2' from master into staging ...

There was one conflict in the NixOS manual; I checked that it still
built after resolving it.

2019-04-01 00:40:03 -04:00

..

2.8.nix

…

3.4.nix

…

4.nix

ffmpeg_4: 4.1.1 -> 4.1.2

2019-03-24 14:20:17 -05:00

generic.nix

ffmpeg, mpv: enable hardware-accelerated decoding with CUDA

2019-02-11 00:32:43 +00:00

vpxenc-0.10-libvpx-1.5.patch

…

vpxenc-1.2-libvpx-1.5.patch

…