From 99c333a30d8751f4011fe9fc1162b16b922a2792 Mon Sep 17 00:00:00 2001
From: Nicolas Chauvet <kwizart@gmail.com>
Date: Sun, 15 May 2016 23:04:17 +0200
Subject: [PATCH 1/4] Revert "Update x264 to 0.148-20160412-fd2c324"

This reverts commit fb43ae0ad57deef7692b8aa69e1614b3322062bd.
---
 x264.spec | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/x264.spec b/x264.spec
index 6c08b65..29437ac 100644
--- a/x264.spec
+++ b/x264.spec
@@ -1,7 +1,7 @@
-# globals for x264-0.148-20160412-fd2c324.tar.bz2
+# globals for x264-0.148-20160118-5c65704.tar.bz2
 %global api 148
-%global gitdate 20160412
-%global gitversion fd2c324
+%global gitdate 20160118
+%global gitversion 5c65704
 %global snapshot %{gitdate}-%{gitversion}
 %global gver .%{gitdate}git%{gitversion}
 %global branch stable
@@ -23,7 +23,7 @@
 Summary: H264/AVC video streams encoder
 Name: x264
 Version: 0.%{api}
-Release: 6%{?gver}%{?_with_bootstrap:_bootstrap}%{?dist}
+Release: 5%{?gver}%{?_with_bootstrap:_bootstrap}%{?dist}
 License: GPLv2+
 URL: http://developers.videolan.org/x264.html
 Source0: %{name}-0.%{api}-%{snapshot}.tar.bz2
@@ -173,9 +173,6 @@ touch -r generic/version.h %{buildroot}%{_includedir}/x264.h %{buildroot}%{_incl
 %{_libdir}/libx26410b.so
 
 %changelog
-* Tue Apr 19 2016 Sérgio Basto <sergio@serjux.com> - 0.148-6.20160412gitfd2c324
-- Update x264 to 0.148-20160412-fd2c324
-
 * Wed Jan 20 2016 Sérgio Basto <sergio@serjux.com> - 0.148-5.20160118git5c65704
 - Fix enable-asm #2
 

From ab1a9f484c9249c2dd14bdc2bb021dfc9b3fdf10 Mon Sep 17 00:00:00 2001
From: Nicolas Chauvet <kwizart@gmail.com>
Date: Mon, 16 May 2016 13:01:08 +0200
Subject: [PATCH 2/4] Update sources

---
 sources | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sources b/sources
index 9329a37..75e0924 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-03f0f92f1689d8f5a4032fb9342ebdba  x264-0.148-20160118-5c65704.tar.bz2
+0cd396fbcce6c5102fe06d7b29fd97dd  x264-0.148-20160412-fd2c324.tar.bz2

From ffe4b8a82e80d1d10e80dde940be5defd68b2376 Mon Sep 17 00:00:00 2001
From: Nicolas Chauvet <kwizart@gmail.com>
Date: Mon, 16 May 2016 13:02:23 +0200
Subject: [PATCH 3/4] Revert "Update sources"

This reverts commit ab1a9f484c9249c2dd14bdc2bb021dfc9b3fdf10.
---
 sources | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sources b/sources
index 75e0924..9329a37 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0cd396fbcce6c5102fe06d7b29fd97dd  x264-0.148-20160412-fd2c324.tar.bz2
+03f0f92f1689d8f5a4032fb9342ebdba  x264-0.148-20160118-5c65704.tar.bz2

From ac69c20d7a71bd2608de1df66741fdf0e6d320cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= <sergio@serjux.com>
Date: Thu, 18 Aug 2016 03:50:17 +0100
Subject: [PATCH 4/4] Revert "Revert "Update x264 to 0.148-20160412-fd2c324""

This reverts commit 99c333a30d8751f4011fe9fc1162b16b922a2792.
---
 x264.spec | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/x264.spec b/x264.spec
index 29437ac..6c08b65 100644
--- a/x264.spec
+++ b/x264.spec
@@ -1,7 +1,7 @@
-# globals for x264-0.148-20160118-5c65704.tar.bz2
+# globals for x264-0.148-20160412-fd2c324.tar.bz2
 %global api 148
-%global gitdate 20160118
-%global gitversion 5c65704
+%global gitdate 20160412
+%global gitversion fd2c324
 %global snapshot %{gitdate}-%{gitversion}
 %global gver .%{gitdate}git%{gitversion}
 %global branch stable
@@ -23,7 +23,7 @@
 Summary: H264/AVC video streams encoder
 Name: x264
 Version: 0.%{api}
-Release: 5%{?gver}%{?_with_bootstrap:_bootstrap}%{?dist}
+Release: 6%{?gver}%{?_with_bootstrap:_bootstrap}%{?dist}
 License: GPLv2+
 URL: http://developers.videolan.org/x264.html
 Source0: %{name}-0.%{api}-%{snapshot}.tar.bz2
@@ -173,6 +173,9 @@ touch -r generic/version.h %{buildroot}%{_includedir}/x264.h %{buildroot}%{_incl
 %{_libdir}/libx26410b.so
 
 %changelog
+* Tue Apr 19 2016 Sérgio Basto <sergio@serjux.com> - 0.148-6.20160412gitfd2c324
+- Update x264 to 0.148-20160412-fd2c324
+
 * Wed Jan 20 2016 Sérgio Basto <sergio@serjux.com> - 0.148-5.20160118git5c65704
 - Fix enable-asm #2