From 140e48f3c1986f8bb5820e9a9bef394b3908ac62 Mon Sep 17 00:00:00 2001
From: Andrew Kelley <superjoe30@gmail.com>
Date: Wed, 16 Mar 2016 16:09:22 -0700
Subject: [PATCH 1/3] ffmpeg: 2.8.5 -> 3.0

---
 pkgs/development/libraries/ffmpeg/3.0.nix | 7 +++++++
 pkgs/top-level/all-packages.nix           | 6 +++++-
 2 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/ffmpeg/3.0.nix

diff --git a/pkgs/development/libraries/ffmpeg/3.0.nix b/pkgs/development/libraries/ffmpeg/3.0.nix
new file mode 100644
index 00000000000..e7d28bfc438
--- /dev/null
+++ b/pkgs/development/libraries/ffmpeg/3.0.nix
@@ -0,0 +1,7 @@
+{ callPackage, ... } @ args:
+
+callPackage ./generic.nix (args // rec {
+  version = "${branch}";
+  branch = "3.0";
+  sha256 = "1h0k05cj6j0nd2i16z7hc5scpwsbg3sfx68lvm0nlwvz5xxgg7zi";
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9eaaab0b0e8..d7d70795530 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6716,11 +6716,15 @@ let
   ffmpeg_2_8 = callPackage ../development/libraries/ffmpeg/2.8.nix {
     inherit (darwin.apple_sdk.frameworks) Cocoa;
   };
+  ffmpeg_3_0 = callPackage ../development/libraries/ffmpeg/3.0.nix {
+    inherit (darwin.apple_sdk.frameworks) Cocoa;
+  };
   # Aliases
   ffmpeg_0 = ffmpeg_0_10;
   ffmpeg_1 = ffmpeg_1_2;
   ffmpeg_2 = ffmpeg_2_8;
-  ffmpeg = ffmpeg_2;
+  ffmpeg_3 = ffmpeg_3_0;
+  ffmpeg = ffmpeg_3;
 
   ffmpeg-full = callPackage ../development/libraries/ffmpeg-full {
     # The following need to be fixed on Darwin

From 9876769698037d9eddac3bc136bfcf207a72ec9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 9 Jun 2016 14:06:18 +0200
Subject: [PATCH 2/3] ffmpeg_3: 3.0 -> 3.0.2

---
 pkgs/development/libraries/ffmpeg/3.0.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/ffmpeg/3.0.nix b/pkgs/development/libraries/ffmpeg/3.0.nix
index e7d28bfc438..14c29f36bed 100644
--- a/pkgs/development/libraries/ffmpeg/3.0.nix
+++ b/pkgs/development/libraries/ffmpeg/3.0.nix
@@ -1,7 +1,7 @@
 { callPackage, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "${branch}";
+  version = "${branch}.2";
   branch = "3.0";
-  sha256 = "1h0k05cj6j0nd2i16z7hc5scpwsbg3sfx68lvm0nlwvz5xxgg7zi";
+  sha256 = "0dpx15001ha9p8h8vfg1lm9pggbc96kmb546hz88wdac5xycgqrh";
 })

From 9bf611414740807312d05d8f782a02a471fe8e1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 9 Jun 2016 14:07:39 +0200
Subject: [PATCH 3/3] ffmpeg: use 2 as the default for now

---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d7d70795530..852c9acb5ab 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6724,7 +6724,7 @@ let
   ffmpeg_1 = ffmpeg_1_2;
   ffmpeg_2 = ffmpeg_2_8;
   ffmpeg_3 = ffmpeg_3_0;
-  ffmpeg = ffmpeg_3;
+  ffmpeg = ffmpeg_2;
 
   ffmpeg-full = callPackage ../development/libraries/ffmpeg-full {
     # The following need to be fixed on Darwin