ffmpeg: add new branch 2.6.1 (no switching yet)

/cc maintainers @codyopel, @fuuzetsu.

Release notes don't indicate any new options or dependencies.
http://git.videolan.org/?p=ffmpeg.git;a=blob;f=RELEASE_NOTES;hb=release/2.6
APIchanges looks like we should be able to replace 2.5 by 2.6
without anything breaking (belongs to staging and needs some testing).
This commit is contained in:
Vladimír Čunát
2015-03-18 18:10:26 +01:00
parent 626c7d8812
commit 105f933f64
3 changed files with 9 additions and 1 deletions
+1
View File
@@ -5593,6 +5593,7 @@ let
ffmpeg_1_2 = callPackage ../development/libraries/ffmpeg/1.2.nix { };
ffmpeg_2_2 = callPackage ../development/libraries/ffmpeg/2.2.nix { };
ffmpeg_2_5 = callPackage ../development/libraries/ffmpeg/2.5.nix { };
ffmpeg_2_6 = callPackage ../development/libraries/ffmpeg/2.6.nix { };
# Aliases
ffmpeg_0 = ffmpeg_0_11;
ffmpeg_1 = ffmpeg_1_2;