projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
47e2920
)
Bump ffmpeg to carl-dcpomatic-12 (4.2.2).
author
Carl Hetherington
<cth@carlh.net>
Wed, 6 May 2020 22:06:44 +0000
(
00:06
+0200)
committer
Carl Hetherington
<cth@carlh.net>
Wed, 6 May 2020 22:06:44 +0000
(
00:06
+0200)
cscript
patch
|
blob
|
history
diff --git
a/cscript
b/cscript
index d1bc02c05d1d6accad2a98648c97626a74a31273..b9cfd940d1cef010603c770d7fbc29f6f9c31af8 100644
(file)
--- a/
cscript
+++ b/
cscript
@@
-364,7
+364,7
@@
def dependencies(target, options):
if target.platform == 'windows' and target.version == 'xp':
deps = [('ffmpeg-cdist', '5783efa', ffmpeg_options)]
elif target.platform != 'linux' or target.distro != 'arch':
- deps = [('ffmpeg-cdist', '
20d3ddf
', ffmpeg_options)]
+ deps = [('ffmpeg-cdist', '
7427ffe
', ffmpeg_options)]
else:
# Use distro-provided FFmpeg on Arch
deps = []