nixpkgs/pkgs/development/libraries/ffmpeg
Tuomas Tynkkynen 8c4aeb1780 Merge staging into master
Brings in:
    - changed output order for multiple outputs:
      https://github.com/NixOS/nixpkgs/pull/14766
    - audit disabled by default
      https://github.com/NixOS/nixpkgs/pull/17916

 Conflicts:
	pkgs/development/libraries/openldap/default.nix
2016-09-01 13:27:27 +03:00
..
0.10.nix ffmpeg: add patches for libvpx 1.5 2016-05-17 01:02:30 +02:00
1.2.nix ffmpeg: add patches for libvpx 1.5 2016-05-17 01:02:30 +02:00
2.8.nix ffmpeg: 2.8.5 -> 2.8.6 (CVE-2016-2329) 2016-02-27 16:34:02 +01:00
3.1.nix ffmpeg: 3.1.2 -> 3.1.3 2016-08-30 09:06:18 +00:00
generic.nix treewide: Shuffle outputs 2016-08-29 14:49:51 +03:00
vpxenc-0.10-libvpx-1.5.patch ffmpeg: add patches for libvpx 1.5 2016-05-17 01:02:30 +02:00
vpxenc-1.2-libvpx-1.5.patch ffmpeg: add patches for libvpx 1.5 2016-05-17 01:02:30 +02:00