Drop no longer needed ignore_vaapi.patch

gstreamer1-libav.spec

@@ -1,13 +1,12 @@
 Name:           gstreamer1-libav
 Version:        1.10.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        GStreamer 1.0 libav-based plug-ins
 Group:          Applications/Multimedia
 License:        LGPLv2+
 URL:            http://gstreamer.freedesktop.org/
 Source0:        http://gstreamer.freedesktop.org/src/gst-libav/gst-libav-%{version}.tar.xz
 Patch0:         gst-ffmpeg-0.10.12-ChangeLog-UTF-8.patch
-Patch1:         ignore_vaapi.patch
 Patch2:         disable_ffmpeg_hw_acceleration.patch
 BuildRequires:  gstreamer1-devel >= 1.6.0
 BuildRequires:  gstreamer1-plugins-base-devel >= 1.6.0
@@ -44,7 +43,6 @@ plug-in.
 %prep
 %setup -q -n gst-libav-%{version}
 %patch0 -p1
-%patch1 -p1
 %patch2 -p1
 # Build against 1.9.2 as 1.10.0 is not yet in the stable Fedora repo
 sed -i 's/1.10.0/1.9.2/' configure
@@ -75,6 +73,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/gstreamer-1.0/libgst*.la
 
 
 %changelog
+* Fri Nov 11 2016 Hans de Goede <j.w.r.degoede@gmail.com> - 1.10.0-2
+- Drop no longer needed ignore_vaapi.patch
+
 * Fri Nov 11 2016 Hans de Goede <j.w.r.degoede@gmail.com> - 1.10.0-1
 - Update to 1.10.0
 

ignore_vaapi.patch

@@ -1,53 +0,0 @@
-From 8666d9fda0be7f86f548297dc83b09d92824de49 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
-Date: Fri, 22 Jul 2016 14:42:59 +0300
-Subject: libav: Ignore VAAPI decoders and VAAPI/nvenc encoders
-
-These can show up when having a build against a system version of ffmpeg.
-
-diff --git a/ext/libav/gstavviddec.c b/ext/libav/gstavviddec.c
-index 53391ad..2fdff95 100644
---- a/ext/libav/gstavviddec.c
-+++ b/ext/libav/gstavviddec.c
-@@ -2061,6 +2061,13 @@ gst_ffmpegviddec_register (GstPlugin * plugin)
-       goto next;
-     }
- 
-+    if (strstr (in_plugin->name, "vaapi")) {
-+      GST_DEBUG
-+          ("Ignoring VAAPI decoder %s. We can't handle this outside of ffmpeg",
-+          in_plugin->name);
-+      goto next;
-+    }
-+
-     GST_DEBUG ("Trying plugin %s [%s]", in_plugin->name, in_plugin->long_name);
- 
-     /* no codecs for which we're GUARANTEED to have better alternatives */
-diff --git a/ext/libav/gstavvidenc.c b/ext/libav/gstavvidenc.c
-index 2d8391b..f22f697 100644
---- a/ext/libav/gstavvidenc.c
-+++ b/ext/libav/gstavvidenc.c
-@@ -973,6 +973,20 @@ gst_ffmpegvidenc_register (GstPlugin * plugin)
-       goto next;
-     }
- 
-+    if (strstr (in_plugin->name, "vaapi")) {
-+      GST_DEBUG
-+          ("Ignoring VAAPI encoder %s. We can't handle this outside of ffmpeg",
-+          in_plugin->name);
-+      goto next;
-+    }
-+
-+    if (g_str_has_suffix (in_plugin->name, "_nvenc")) {
-+      GST_DEBUG
-+          ("Ignoring nvenc encoder %s. We can't handle this outside of ffmpeg",
-+          in_plugin->name);
-+      goto next;
-+    }
-+
-     /* only video encoders */
-     if (!av_codec_is_encoder (in_plugin)
-         || in_plugin->type != AVMEDIA_TYPE_VIDEO)
--- 
-cgit v0.10.2
-