opencv: use default/latest ffmpeg

This commit is contained in:
Mathijs Kwik 2013-12-23 10:50:07 +01:00
parent 3a1d772861
commit 4fdeca4c57

View File

@ -5401,12 +5401,9 @@ let
openct = callPackage ../development/libraries/openct { }; openct = callPackage ../development/libraries/openct { };
opencv = callPackage ../development/libraries/opencv { opencv = callPackage ../development/libraries/opencv { };
ffmpeg = ffmpeg_0_6_90;
};
opencv_2_1 = callPackage ../development/libraries/opencv/2.1.nix { opencv_2_1 = callPackage ../development/libraries/opencv/2.1.nix {
ffmpeg = ffmpeg_0_6_90;
libpng = libpng12; libpng = libpng12;
}; };