Domen Kožar b1a8ae2a35 ffmpeg: fix bad merge

2016-03-27 13:31:04 +01:00

..

0.10.nix

ffmpeg: update branches

2015-05-16 20:23:25 -04:00

1.2.nix

ffmpeg: refactor to generic

2015-02-28 12:12:25 -05:00

2.8.nix

ffmpeg: 2.8.5 -> 2.8.6 (CVE-2016-2329)

2016-02-27 16:34:02 +01:00

generic.nix

ffmpeg: fix bad merge

2016-03-27 13:31:04 +01:00