From 0e9cc320b18ae53e2bf0cc8fdb9984b58e33e0ec Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 2 Mar 2016 00:22:55 +0000 Subject: Bump ffmpeg to master somewhere post 3.0. --- cscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cscript') diff --git a/cscript b/cscript index 2bb2b6c28..14a48811f 100644 --- a/cscript +++ b/cscript @@ -261,7 +261,7 @@ def dependencies(target): else: ffmpeg_options = {} - return (('ffmpeg-cdist', '96d67de', ffmpeg_options), + return (('ffmpeg-cdist', '1ebd1c8', ffmpeg_options), ('libdcp', 'v1.3.1'), ('libsub', 'v1.1.11')) -- cgit v1.2.3 From a2668dcfc484e5e2b158bd3b51b835a96660c8d8 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 2 Mar 2016 00:32:38 +0000 Subject: Bump ffmpeg for a missing file in the carl-dcpomatic-2 branch. --- cscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cscript') diff --git a/cscript b/cscript index 14a48811f..511beb766 100644 --- a/cscript +++ b/cscript @@ -261,7 +261,7 @@ def dependencies(target): else: ffmpeg_options = {} - return (('ffmpeg-cdist', '1ebd1c8', ffmpeg_options), + return (('ffmpeg-cdist', 'f2952f3', ffmpeg_options), ('libdcp', 'v1.3.1'), ('libsub', 'v1.1.11')) -- cgit v1.2.3