summaryrefslogtreecommitdiff
path: root/media
diff options
context:
space:
mode:
authorMichael Forney <mforney@mforney.org>2016-07-03 02:57:21 -0700
committerMichael Forney <mforney@mforney.org>2016-07-03 02:57:21 -0700
commit1d3bcba154dca620bde5127ced121ea393e22255 (patch)
treea17bb2bd9df04a0685c48c97d4268d7f2920781e /media
parentcf2486b014c1f7617cd95180821a8fc91afb016a (diff)
ffmpeg: Update to 3.1.1
Diffstat (limited to 'media')
-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 d00491fd..0cfbf088 100644
--- a/media/ffmpeg/.rev
+++ b/media/ffmpeg/.rev
@@ -1 +1 @@
-1
+2
diff --git a/media/ffmpeg/src b/media/ffmpeg/src
-Subproject 18ce5a4d1b3f87b3b45651401cdf3352de34cfa
+Subproject ce36e74e75751c721185fbebaa4ee8714b44c5a