Merge master into staging

2018-04-04 19:36:39 +02:00
parent d051989efa b9484875bc
commit 23741692fa
121 changed files with 2824 additions and 3507 deletions
@@ -17,11 +17,7 @@ rec {

  gst-libav = callPackage ./libav { inherit gst-plugins-base; };

-  gnonlin = callPackage ./gnonlin { inherit gst-plugins-base; };
-
-  # TODO: gnonlin is deprecated in gst-editing-services, better switch to nle
-  # (Non Linear Engine).
-  gst-editing-services = callPackage ./ges { inherit gnonlin; };
+  gst-editing-services = callPackage ./ges { inherit gst-plugins-base; };

  gst-vaapi = callPackage ./vaapi {
    inherit gst-plugins-base gstreamer gst-plugins-bad;