diff options
| author |  Mark D. Roth <roth@google.com> | 2016-08-25 08:18:25 -0700 |
|---|---|---|
| committer | Mark D. Roth <roth@google.com> | 2016-08-25 08:18:25 -0700 |
| commit | f03b112d12d32f42b023a5c49d994438dde0a95e (patch) | |
| tree | 979d4e64ecf7ed31495d635ea4caa7c037284f72 /tools/gource/make-video.sh | |
| parent | 7187ab9866f95181212cdb8b80fcbe0a36b01765 (diff) | |
| parent | 19ea0cffd7ba3df686ed05671f9ed35b8e9fa830 (diff) | |
Merge remote-tracking branch 'upstream/master' into cq_verifier_file_line
Diffstat (limited to 'tools/gource/make-video.sh')
| -rwxr-xr-x | tools/gource/make-video.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/gource/make-video.sh b/tools/gource/make-video.sh index 02d79df81b..cde0437255 100755 --- a/tools/gource/make-video.sh +++ b/tools/gource/make-video.sh @@ -37,7 +37,7 @@ $(dirname $0)/gource.sh \ --stop-at-end \ --output-ppm-stream - \ $@ | \ -ffmpeg \ +avconv \ -y \ -r 60 \ -f image2pipe \ |