diff options
| author | Nathaniel Baxter <nathaniel.baxter@gmail.com> | 2014-09-27 09:13:29 +1000 |
|---|---|---|
| committer | Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk> | 2014-09-27 01:04:38 +0100 |
| commit | 859918d235f39747a4eed36192105b69bab216d6 (patch) | |
| tree | 868cbc2f3a296cbe7bc347109caf823d56d885d1 /pkgs/top-level | |
| parent | d346a9cc079f5d0441795504ccfd87db1fc2d89a (diff) | |
| download | nixlib-859918d235f39747a4eed36192105b69bab216d6.tar nixlib-859918d235f39747a4eed36192105b69bab216d6.tar.gz nixlib-859918d235f39747a4eed36192105b69bab216d6.tar.bz2 nixlib-859918d235f39747a4eed36192105b69bab216d6.tar.lz nixlib-859918d235f39747a4eed36192105b69bab216d6.tar.xz nixlib-859918d235f39747a4eed36192105b69bab216d6.tar.zst nixlib-859918d235f39747a4eed36192105b69bab216d6.zip | |
vlc: Add ffmpeg version 2.3.x for vlc.
Vlc doesn't support libavcodec >= 56 yet, which means it needs an older version of ffmpeg. Closes #4286
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6dd36592544b..3606ec56755a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4848,6 +4848,8 @@ let vpxSupport = !stdenv.isMips; }; + ffmpeg_2_3 = callPackage ../development/libraries/ffmpeg/2.3.x.nix { }; + ffmpeg_2 = callPackage ../development/libraries/ffmpeg/2.x.nix { }; ffmpeg = ffmpeg_2; @@ -10401,7 +10403,9 @@ let inherit (xlibs) libX11; }; - vlc = callPackage ../applications/video/vlc { }; + vlc = callPackage ../applications/video/vlc { + ffmpeg = ffmpeg_2_3; + }; vmpk = callPackage ../applications/audio/vmpk { }; |