Skip to content

Commit

Permalink
Merge pull request #5 from JuliaIO/tweaks_for_videoio
Browse files Browse the repository at this point in the history
Expanding collect to other methods and testing
  • Loading branch information
IanButterworth authored Jul 12, 2019
2 parents bfe09ff + 6068ccc commit dd5bd66
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 6 deletions.
7 changes: 1 addition & 6 deletions src/FFMPEG.jl
Original file line number Diff line number Diff line change
Expand Up @@ -91,13 +91,8 @@ built with clang version 6.0.1 (tags/RELEASE_601/final)
[...]
```
"""
function exe(args::AbstractString...; command = FFMPEG.ffmpeg)
exe(args::AbstractString...; command = FFMPEG.ffmpeg, collect = false) = exe(Cmd([command, args...]), command=command, collect=collect)

withenv(execenv) do
Base.run(Cmd([command, args...]))
end

end

"""
collectexecoutput(exec::Cmd) -> Array of output lines
Expand Down
1 change: 1 addition & 0 deletions test/runtests.jl
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ end
@show FFMPEG.versioninfo()
@test text_execute(() -> FFMPEG.exe("-version"))
@test text_execute(() -> FFMPEG.exe(`-version`))
@test text_execute(() -> FFMPEG.exe(`-version`, collect=true))
@test text_execute(() -> FFMPEG.ffmpeg_exe(`-version`))
@test text_execute(() -> FFMPEG.ffprobe_exe(`-version`))
@test text_execute(() -> ffmpeg`-version`)
Expand Down

2 comments on commit dd5bd66

@IanButterworth
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JuliaRegistrator
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Registration pull request updated: JuliaRegistries/General/1982

After the above pull request is merged, it is recommended that a tag is created on this repository for the registered package version.

This will be done automatically if Julia TagBot is installed, or can be done manually through the github interface, or via:

git tag -a v0.2.0 -m "<description of version>" dd5bd66002547e4a1b99fda94eddf853119c77a8
git push origin v0.2.0

Please sign in to comment.