From e3acde0b4471d1594c9175a4ed76a8796382913c Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Wed, 11 Dec 2013 00:58:53 +0100
Subject: [PATCH] ffmpeg: switch to default versioning-scheme

---
 pkgs/development/libraries/ffmpeg/{default.nix => 0.10.nix} | 0
 pkgs/top-level/all-packages.nix                             | 4 +++-
 2 files changed, 3 insertions(+), 1 deletion(-)
 rename pkgs/development/libraries/ffmpeg/{default.nix => 0.10.nix} (100%)

diff --git a/pkgs/development/libraries/ffmpeg/default.nix b/pkgs/development/libraries/ffmpeg/0.10.nix
similarity index 100%
rename from pkgs/development/libraries/ffmpeg/default.nix
rename to pkgs/development/libraries/ffmpeg/0.10.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 72c9c41dcfd8..38d5f25fa1ae 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4126,7 +4126,7 @@ let
 
   fcgi = callPackage ../development/libraries/fcgi { };
 
-  ffmpeg = callPackage ../development/libraries/ffmpeg {
+  ffmpeg_0_10 = callPackage ../development/libraries/ffmpeg/0.10.nix {
     vpxSupport = !stdenv.isMips;
 
     stdenv = if stdenv.isDarwin
@@ -4152,6 +4152,8 @@ let
     texinfo = texinfo5;
   };
 
+  ffmpeg = ffmpeg_0_10;
+
   ffms = callPackage ../development/libraries/ffms { };
 
   fftw = callPackage ../development/libraries/fftw {