Frederik Rietdijk 981b94442b Merge staging-next into staging

2020-01-05 16:10:40 +01:00

..

2.8.nix

ffmpeg_2_8: 2.8.14 -> 2.8.15

2020-01-04 11:50:10 +00:00

3.4.nix

ffmpeg: 3.4.6 -> 3.4.7 (security)

2019-12-29 10:40:04 +01:00

4.nix

ffmpeg_4: 4.2.1 -> 4.2.2

2020-01-04 11:50:10 +00:00

generic.nix

Revert "Revert "ffmpeg: fix cross compilation""

2020-01-04 08:26:03 +00:00