diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-03-08 10:36:44 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-03-08 10:36:44 +0000 |
| commit | 0f3c2864599f9e5a5ec001266b4aefb0205d1e1f (patch) | |
| tree | 2158a8f135e4a196b784df285db008e5ec2439e5 /cscript | |
| parent | bdae32bb84672026c1a373e809804109e95accf4 (diff) | |
| parent | a2668dcfc484e5e2b158bd3b51b835a96660c8d8 (diff) | |
Fix merge.
Diffstat (limited to 'cscript')
| -rw-r--r-- | cscript | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -261,7 +261,7 @@ def dependencies(target): else: ffmpeg_options = {} - return (('ffmpeg-cdist', '96d67de', ffmpeg_options), + return (('ffmpeg-cdist', 'f2952f3', ffmpeg_options), ('libdcp', 'v1.3.1'), ('libsub', 'v1.1.11')) |