From 474aeb0b3d2ea05b7c15fb3e1d00924db3524967 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 5 Feb 2015 11:19:18 +0100
Subject: [PATCH] ffmpeg-2.2: update (still used by vlc)

---
 pkgs/development/libraries/ffmpeg/2.2.x.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/ffmpeg/2.2.x.nix b/pkgs/development/libraries/ffmpeg/2.2.x.nix
index 51a6bb8c880c..d6e3c6a7db9d 100644
--- a/pkgs/development/libraries/ffmpeg/2.2.x.nix
+++ b/pkgs/development/libraries/ffmpeg/2.2.x.nix
@@ -5,12 +5,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "2.2.11";
+  version = "2.2.12";
   name = "ffmpeg-${version}";
 
   src = fetchurl {
     url = "http://www.ffmpeg.org/releases/${name}.tar.bz2";
-    sha256 = "06sli7xvihh97ss6a2mkdq4dcj3rg1w8zffrmjfc1hvyjxhc8f2r";
+    sha256 = "1a1ki0v7c94l68blbimh3xl5adz599ql8nrdm2q0g285qy6mqxck";
   };
 
   subtitleSupport = config.ffmpeg.subtitle or true;
@@ -104,6 +104,6 @@ stdenv.mkDerivation rec {
     license = if (fdkAACSupport || faacSupport) then stdenv.lib.licenses.unfree else stdenv.lib.licenses.gpl2Plus;
     platforms = stdenv.lib.platforms.linux;
     maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
-    branch = "2.3";
+    branch = "2.2";
   };
 }