Skip to content

Commit dd5bd66

Browse files
Merge pull request #5 from JuliaIO/tweaks_for_videoio
Expanding collect to other methods and testing
2 parents bfe09ff + 6068ccc commit dd5bd66

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

src/FFMPEG.jl

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -91,13 +91,8 @@ built with clang version 6.0.1 (tags/RELEASE_601/final)
9191
[...]
9292
```
9393
"""
94-
function exe(args::AbstractString...; command = FFMPEG.ffmpeg)
94+
exe(args::AbstractString...; command = FFMPEG.ffmpeg, collect = false) = exe(Cmd([command, args...]), command=command, collect=collect)
9595

96-
withenv(execenv) do
97-
Base.run(Cmd([command, args...]))
98-
end
99-
100-
end
10196

10297
"""
10398
collectexecoutput(exec::Cmd) -> Array of output lines

test/runtests.jl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ end
1313
@show FFMPEG.versioninfo()
1414
@test text_execute(() -> FFMPEG.exe("-version"))
1515
@test text_execute(() -> FFMPEG.exe(`-version`))
16+
@test text_execute(() -> FFMPEG.exe(`-version`, collect=true))
1617
@test text_execute(() -> FFMPEG.ffmpeg_exe(`-version`))
1718
@test text_execute(() -> FFMPEG.ffprobe_exe(`-version`))
1819
@test text_execute(() -> ffmpeg`-version`)

0 commit comments

Comments
 (0)