summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Forney <mforney@mforney.org>2016-10-22 02:48:48 -0700
committerMichael Forney <mforney@mforney.org>2016-10-22 02:48:48 -0700
commit0edf40581d172afbae8526bedfc80165879a3f63 (patch)
tree3ff8f9c232ceb6edf9f8e8eab42ccb6f6baef893
parent7727d8fe8ab175c740b9593bf265257eeed28995 (diff)
ffmpeg: Update to 3.1.5
-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 b8626c4c..7ed6ff82 100644
--- a/media/ffmpeg/rev
+++ b/media/ffmpeg/rev
@@ -1 +1 @@
-4
+5
diff --git a/media/ffmpeg/src b/media/ffmpeg/src
-Subproject c2ea70628215ccede53240843b4514a6c339ab2
+Subproject 2a5c41e3e4a7e763503af59de903d5649dcc071