From d0f50cffc888feb1725e24e0504853e74ab73467 Mon Sep 17 00:00:00 2001
From: leigh123linux <leigh123linux@googlemail.com>
Date: Tue, 17 Oct 2017 11:16:50 +0100
Subject: [PATCH] Rebuild for ffmpeg update

---
 mplayer-add-include_vdpau_x11.patch | 23 +++++++++++++++++++++++
 mplayer.spec                        | 10 ++++++++--
 2 files changed, 31 insertions(+), 2 deletions(-)
 create mode 100644 mplayer-add-include_vdpau_x11.patch

diff --git a/mplayer-add-include_vdpau_x11.patch b/mplayer-add-include_vdpau_x11.patch
new file mode 100644
index 0000000..3c2891b
--- /dev/null
+++ b/mplayer-add-include_vdpau_x11.patch
@@ -0,0 +1,23 @@
+From 2fe876f5ed67edd72e6da4fd0ccaae03a1952d4c Mon Sep 17 00:00:00 2001
+From: al <al@b3059339-0415-0410-9bf9-f77b7e298cf2>
+Date: Wed, 19 Apr 2017 23:06:04 +0000
+Subject: [PATCH] vo_vdpau: Explicitly include header vdpau_x11.h
+
+The include from inside libavcodec/vdpau.h was removed in FFmpeg
+commit d40e181bec22014a9ea312ab6837f7f0bc4f9e42 .
+---
+ libvo/vo_vdpau.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/libvo/vo_vdpau.c b/libvo/vo_vdpau.c
+index 7b94cad1b9..99f08d6c7b 100644
+--- a/libvo/vo_vdpau.c
++++ b/libvo/vo_vdpau.c
+@@ -34,6 +34,7 @@
+ 
+ #include <stdio.h>
+ #include <strings.h>
++#include <vdpau/vdpau_x11.h>
+ 
+ #include "config.h"
+ #include "sub/ass_mp.h"
diff --git a/mplayer.spec b/mplayer.spec
index fcab644..a210ef2 100644
--- a/mplayer.spec
+++ b/mplayer.spec
@@ -7,9 +7,9 @@
 Name:           mplayer
 Version:        1.3.0
 %if 0%{?svn}
-Release:        41.%{?pre}%{?dist}
+Release:        42.%{?pre}%{?dist}
 %else
-Release:        11%{?dist}
+Release:        12%{?dist}
 %endif
 Summary:        Movie player playing most video formats and DVDs
 
@@ -41,6 +41,7 @@ Patch4:         %{name}-fix-screenshot-crash.patch
 # https://bugzilla.rpmfusion.org/show_bug.cgi?id=4470
 # Patch is from an upstream svn commit
 Patch5:         %{name}-fix-vo_png.patch
+Patch6:         %{name}-add-include_vdpau_x11.patch
 
 BuildRequires:  SDL-devel
 BuildRequires:  a52dec-devel
@@ -236,6 +237,7 @@ rm -rf ffmpeg
 %patch3 -p1 -b .ffmpeg
 %patch4 -p1 -b .screenshot
 %patch5 -p1 -b .vo_png
+%patch6 -p1 -b .vdpau_x11
 
 mkdir GUI
 cp -a `ls -1|grep -v GUI` GUI/
@@ -391,6 +393,10 @@ update-desktop-database &>/dev/null || :
 %{_datadir}/mplayer/*.fp
 
 %changelog
+* Tue Oct 17 2017 Leigh Scott <leigh123linux@googlemail.com> - 1.3.0-12
+- Rebuild for ffmpeg update
+- Add build upstream build fix for newer ffmpeg
+
 * Thu Aug 31 2017 RPM Fusion Release Engineering <kwizart@rpmfusion.org> - 1.3.0-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild