summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Forney <mforney@mforney.org>2016-10-12 18:27:43 -0700
committerMichael Forney <mforney@mforney.org>2016-10-12 20:34:00 -0700
commit58bcb9d9f5bb23ab2ac733c2aaf0643dd88aab1d (patch)
treec9ecbf1711ad6d44e9be59ac738cbe2528d23e18
parent055b0502f15be3a21c851d3a9e2baaa03452f214 (diff)
ffmpeg: Update to 3.1.4
-rw-r--r--media/ffmpeg/rev2
m---------media/ffmpeg/src0
2 files changed, 1 insertions, 1 deletions
diff --git a/media/ffmpeg/rev b/media/ffmpeg/rev
index 00750edc..b8626c4c 100644
--- a/media/ffmpeg/rev
+++ b/media/ffmpeg/rev
@@ -1 +1 @@
-3
+4
diff --git a/media/ffmpeg/src b/media/ffmpeg/src
-Subproject c46d22a4a58467bdc7885685b06a2114dd181c4
+Subproject c2ea70628215ccede53240843b4514a6c339ab2