From 5b4635d6fa12b7577f799aefb1cd2ae826a31a1a Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Wed, 11 Dec 2013 01:05:03 +0100
Subject: [PATCH] ffmpeg: change default 0.10 -> 2.0

This commit, and the "pinnings" that follow should not cause major issues.
I personally checked (build-only) each and every package that depends
on ffmpeg to find the maximum supported version.
I performed this on stdenv-updates+glibc2.18+x-updates but I don't expect
that to matter.
---
 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 24055cf747f..c64856f7198 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4152,7 +4152,7 @@ let
     texinfo = texinfo5;
   };
 
-  ffmpeg = ffmpeg_0_10;
+  ffmpeg = ffmpeg_2;
 
   ffms = callPackage ../development/libraries/ffms { };