From 0f69807bae7f9987f282701644db7bba21f95487 Mon Sep 17 00:00:00 2001
From: MXEBot as Travis CI <mxebot@gmail.com>
Date: Fri, 8 Jul 2016 19:11:41 +0000
Subject: Update versions.json & build-matrix.html

---
 build-matrix.html | 4 ++--
 versions.json     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/build-matrix.html b/build-matrix.html
index 5b506ff..f2d1c72 100644
--- a/build-matrix.html
+++ b/build-matrix.html
@@ -539,7 +539,7 @@ feel free to submit a pull request.
 
 <tr>
  <th class="row">ffmpeg</th>
- <td>3.0</td>
+ <td>3.1.1</td>
       <td class="supported">&#x2713;</td>
       <td class="supported">&#x2713;</td>
       <td class="supported">&#x2713;</td>
@@ -4069,7 +4069,7 @@ feel free to submit a pull request.
 
 <tr>
  <th class="row">x264</th>
- <td>20151011-224&hellip;</td>
+ <td>20160706-224&hellip;</td>
       <td class="supported">&#x2713;</td>
       <td class="supported">&#x2713;</td>
       <td class="supported">&#x2713;</td>
diff --git a/versions.json b/versions.json
index d7d73b2..b77f9f0 100644
--- a/versions.json
+++ b/versions.json
@@ -49,7 +49,7 @@
     "expat": "2.2.0",
     "faad2": "2.7",
     "fdk-aac": "0.1.4",
-    "ffmpeg": "3.0",
+    "ffmpeg": "3.1.1",
     "fftw": "3.3.4",
     "file": "5.24",
     "flac": "1.3.1",
@@ -402,7 +402,7 @@
     "winpcap": "4_1_3",
     "wt": "3.3.5",
     "wxwidgets": "3.0.2",
-    "x264": "20151011-2245",
+    "x264": "20160706-2245",
     "xapian-core": "1.2.21",
     "xerces": "3.1.2",
     "xmlrpc-c": "d4364f4",
-- 
cgit v0.12