summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-01-01 23:35:46 +0000
committerCarl Hetherington <cth@carlh.net>2014-01-01 23:35:46 +0000
commit6c8c6b5d2f95b8e8fd7f72e34e3a7fded6762794 (patch)
tree599697e0bca27604bd2b4784b87965c568c49276
parent7dedacfb85b10cdf0f5697ea1d0fe8cc5cf8379e (diff)
Bump FFmpeg version.
-rw-r--r--ChangeLog4
-rw-r--r--cscript2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 356ac12ef..52c262251 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-01-01 Carl Hetherington <cth@carlh.net>
+
+ * Bump ffmpeg version.
+
2013-12-30 Carl Hetherington <cth@carlh.net>
* Version 1.54 released.
diff --git a/cscript b/cscript
index f4db23882..773d7cda2 100644
--- a/cscript
+++ b/cscript
@@ -114,7 +114,7 @@ def make_control(version, bits, filename):
print >>f,' digital projectors.'
def dependencies(target):
- return (('ffmpeg-cdist', '0b7ef017aca8b572914518c759db1e234d8fc505'),
+ return (('ffmpeg-cdist', 'a629ea68a20d990b4e61c16067e91563d8d08f50'),
('libdcp', 'v0.91'))
def build(target):