diff --git a/.appveyor.yml b/.appveyor.yml deleted file mode 100644 index 69e8bb3..0000000 --- a/.appveyor.yml +++ /dev/null @@ -1,37 +0,0 @@ -# Documentation: https://github.com/JuliaCI/Appveyor.jl -environment: - matrix: - - julia_version: 1.3 - - julia_version: nightly -platform: - - x86 - - x64 -matrix: - allow_failures: - - julia_version: nightly - -branches: - only: - - master - - /release-.*/ - -cache: - - '%USERPROFILE%\.julia\artifacts' - -notifications: - - provider: Email - on_build_success: false - on_build_failure: false - on_build_status_changed: false - -install: - - ps: iex ((new-object net.webclient).DownloadString("https://raw.githubusercontent.com/JuliaCI/Appveyor.jl/version-1/bin/install.ps1")) -build_script: - - echo "%JL_BUILD_SCRIPT%" - - C:\julia\bin\julia -e "%JL_BUILD_SCRIPT%" -test_script: - - echo "%JL_TEST_SCRIPT%" - - C:\julia\bin\julia -e "%JL_TEST_SCRIPT%" -on_success: - - echo "%JL_CODECOV_SCRIPT%" - - C:\julia\bin\julia -e "%JL_CODECOV_SCRIPT%" diff --git a/.drone.jsonnet b/.drone.jsonnet deleted file mode 100644 index 21a8dd5..0000000 --- a/.drone.jsonnet +++ /dev/null @@ -1,27 +0,0 @@ -local Pipeline(os, arch, version) = { - kind: "pipeline", - name: os+" - "+arch+" - Julia "+version, - platform: { - os: os, - arch: arch - }, - steps: [ - { - name: "build", - image: "julia:"+version, - commands: [ - "julia --project=. --check-bounds=yes --color=yes -e 'using InteractiveUtils; versioninfo(verbose=true); using Pkg; Pkg.build(); Pkg.test(coverage=true)'" - ] - } - ], - trigger: { - branch: ["master"] - } -}; - -[ - Pipeline("linux", "arm", "1.3"), - Pipeline("linux", "arm", "1.4.1"), - Pipeline("linux", "arm64", "1.3"), - Pipeline("linux", "arm64", "1.5") -] diff --git a/.drone.yml b/.drone.yml deleted file mode 100644 index f50dd3e..0000000 --- a/.drone.yml +++ /dev/null @@ -1,73 +0,0 @@ ---- -kind: pipeline -name: linux - arm - Julia 1.3 - -platform: - os: linux - arch: arm - -steps: -- name: build - image: julia:1.3 - commands: - - "julia --project=. --check-bounds=yes --color=yes -e 'using InteractiveUtils; versioninfo(verbose=true); using Pkg; Pkg.build(); Pkg.test(coverage=true)'" - -trigger: - branch: - - master - ---- -kind: pipeline -name: linux - arm - Julia 1.4.1 - -platform: - os: linux - arch: arm - -steps: -- name: build - image: julia:1.4.1 - commands: - - "julia --project=. --check-bounds=yes --color=yes -e 'using InteractiveUtils; versioninfo(verbose=true); using Pkg; Pkg.build(); Pkg.test(coverage=true)'" - -trigger: - branch: - - master - ---- -kind: pipeline -name: linux - arm64 - Julia 1.3 - -platform: - os: linux - arch: arm64 - -steps: -- name: build - image: julia:1.3 - commands: - - "julia --project=. --check-bounds=yes --color=yes -e 'using InteractiveUtils; versioninfo(verbose=true); using Pkg; Pkg.build(); Pkg.test(coverage=true)'" - -trigger: - branch: - - master - ---- -kind: pipeline -name: linux - arm64 - Julia 1.5 - -platform: - os: linux - arch: arm64 - -steps: -- name: build - image: julia:1.5 - commands: - - "julia --project=. --check-bounds=yes --color=yes -e 'using InteractiveUtils; versioninfo(verbose=true); using Pkg; Pkg.build(); Pkg.test(coverage=true)'" - -trigger: - branch: - - master - -... diff --git a/.gitattributes b/.gitattributes index 8f2ca0e..8b13789 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1 @@ -.drone.jsonnet linguist-detectable=false + diff --git a/.travis.yml b/.travis.yml index 52fa96a..6182d58 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,7 @@ arch: - x86 - arm64 julia: - - 1.5 + - 1.6 - 1 - nightly matrix: diff --git a/Project.toml b/Project.toml index ce44dc7..e78a6ce 100644 --- a/Project.toml +++ b/Project.toml @@ -1,14 +1,14 @@ name = "FFMPEG" uuid = "c87230d0-a227-11e9-1b43-d7ebe4e7570a" authors = ["SimonDanisch "] -version = "0.4.2" +version = "1.0.0" [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" +julia = "1.6" [extras] Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" diff --git a/src/FFMPEG.jl b/src/FFMPEG.jl index 5c809a8..b5d5618 100644 --- a/src/FFMPEG.jl +++ b/src/FFMPEG.jl @@ -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() @@ -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