Merge tag 'upstream/0.25.0'

Upstream version 0.25.0

1 files changed, 15 insertions, 1 deletions

diff --git a/thumbnailer/shotwell-video-thumbnailer.vala b/thumbnailer/shotwell-video-thumbnailer.vala
index 437d132..234868a 100644
--- a/thumbnailer/shotwell-video-thumbnailer.vala
+++ b/thumbnailer/shotwell-video-thumbnailer.vala
@@ -21,7 +21,21 @@ class ShotwellThumbnailer {
         Gst.StateChangeReturn ret;
         
         Gst.init(ref args);
-        
+
+        var registry = Gst.Registry.@get ();
+
+        var feature = registry.find_feature ("vaapidecodebin",
+                                             typeof (Gst.ElementFactory));
+        if (feature != null) {
+            registry.remove_feature (feature);
+        }
+
+        feature = registry.find_feature ("vaapidecode",
+                                             typeof (Gst.ElementFactory));
+        if (feature != null) {
+            registry.remove_feature (feature);
+        }
+
         if (args.length != 2) {
             stdout.printf("usage: %s [filename]\n Writes video thumbnail to stdout\n", args[0]);
             return 1;