Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update FFMPEG to use 6.1.1 #59

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
+5 −144
Open

Update FFMPEG to use 6.1.1 #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4884502
bump ffmpeg version
theogf Feb 16, 2024
3eace52
remove avresample reference
theogf Feb 16, 2024
2d3e355
revert remove bound
theogf Feb 16, 2024
6670f89
update project version and lower julia bound
theogf Feb 17, 2024
caece51
remove drone
theogf Feb 18, 2024
e30a3ef
remove mention drone
theogf Feb 18, 2024
6f92ddc
Remove AppVeyor
theogf Feb 18, 2024
83d5d62
Merge branch 'master' into tgf/update-FFMPEG
IanButterworth Dec 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 0 additions & 37 deletions .appveyor.yml
View file
Open in desktop

This file was deleted.

27 changes: 0 additions & 27 deletions .drone.jsonnet
View file
Open in desktop

This file was deleted.

73 changes: 0 additions & 73 deletions .drone.yml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion .gitattributes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
.drone.jsonnet linguist-detectable=false

2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ arch:
- x86
- arm64
julia:
- 1.5
- 1.6
- 1
- nightly
matrix:
Expand Down
6 changes: 3 additions & 3 deletions Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
name = "FFMPEG"
uuid = "c87230d0-a227-11e9-1b43-d7ebe4e7570a"
authors = ["SimonDanisch <[email protected]>"]
version = "0.4.2"
version = "1.0.0"
Copy link
Member

@IanButterworth IanButterworth Dec 24, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

Ref. #59 (comment)

Suggested change
version = "1.0.0"
version = "0.4.3"


[deps]
FFMPEG_jll = "b22a6f82-2f65-5046-a5b2-351ab43fb4e5"

[compat]
FFMPEG_jll = "4.3.1"
julia = "^1.3"
FFMPEG_jll = "4.3.1, 6.1.1"
Copy link
Member

Choose a reason for hiding this comment

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

Hmmm.. I'm not sure about adding this in a patch release.

At least can we check VideoIO.jl tests before releasing this

Copy link
Author

Choose a reason for hiding this comment

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

Hmmm.. I'm not sure about adding this in a patch release.

I agree, that would also mean moving the julia bound to 1.6

At least can we check VideoIO.jl tests before releasing this

By this do you mean testing locally?

Copy link
Member

Choose a reason for hiding this comment

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

Maybe also move to v1.0.0 altogether, to avoid the mess of using only two version numbers, this package hasn't been touched in 3 years, looks moderately stable.

Copy link
Member

Choose a reason for hiding this comment

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

By this do you mean testing locally?

You could edit the VideoIO CI to dev this branch and test on a PR

Copy link
Author

Choose a reason for hiding this comment

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

Maybe also move to v1.0.0 altogether, to avoid the mess of using only two version numbers, this package hasn't been touched in 3 years, looks moderately stable.

I see there are these drone CI running on Julia 1.3 - 1.5, can I remove it safely?

Copy link
Member

Choose a reason for hiding this comment

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

The Drone service is completely broken, just remove it.

Copy link
Author

Choose a reason for hiding this comment

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

I also remove AppVeyor as the service in Julia is unmaintained and version still refers to 1.5

julia = "1.6"

[extras]
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
Expand Down
2 changes: 0 additions & 2 deletions src/FFMPEG.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ _avutil_version() = av_version(ccall((:avutil_version, libavutil), U
_swscale_version() = av_version(ccall((:swscale_version, libswscale), UInt32, ()))
_avdevice_version() = av_version(ccall((:avdevice_version, libavdevice), UInt32, ()))
_avfilter_version() = av_version(ccall((:avfilter_version, libavfilter), UInt32, ()))
_avresample_version() = av_version(ccall((:avresample_version, libavresample), UInt32, ()))
_swresample_version() = av_version(ccall((:swresample_version, libswresample), UInt32, ()))

function versioninfo()
Expand All @@ -21,7 +20,6 @@ function versioninfo()
println("SWScale version $(_swscale_version())")
println("AVDevice version $(_avdevice_version())")
println("AVFilters version $(_avfilter_version())")
println("AVResample version $(_avresample_version())")
println("SWResample version $(_swresample_version())")
end

Expand Down
Loading