From 1be81c96e0656f3f72d453ea5b4248071473f6d6 Mon Sep 17 00:00:00 2001 From: Kevin Squire Date: Tue, 21 Aug 2018 16:33:31 -0700 Subject: [PATCH 01/12] Drop v0.6 support --- .travis.yml | 16 +++++++++++----- REQUIRE | 2 +- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index f36d66c5..29441b90 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,8 @@ os: - linux # - osx julia: - - 0.6 + - 0.7 + - 1.0 - nightly matrix: allow_failures: @@ -27,7 +28,12 @@ matrix: notifications: email: false # uncomment the following lines to override the default test script -script: - - julia -e 'Pkg.clone(pwd())' - - julia -e 'Pkg.build("VideoIO")' - - if [ -f test/runtests.jl ]; then julia -e 'Pkg.test("VideoIO", coverage=true)'; fi +# script: +# - julia -e 'Pkg.clone(pwd())' +# - julia -e 'Pkg.build("VideoIO")' +# - if [ -f test/runtests.jl ]; then julia -e 'Pkg.test("VideoIO", coverage=true)'; fi +after_success: + # push coverage results to Coveralls + - julia -e 'cd(Pkg.dir("VideoIO")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())' + # push coverage results to Codecov + - julia -e 'cd(Pkg.dir("VideoIO")); Pkg.add("Coverage"); using Coverage; Codecov.submit(Codecov.process_folder())' diff --git a/REQUIRE b/REQUIRE index d8b8b2d8..09fd24cb 100644 --- a/REQUIRE +++ b/REQUIRE @@ -1,4 +1,4 @@ -julia 0.6 +julia 0.7 BinDeps 0.3.4 FixedPointNumbers 0.3.0 ColorTypes From a44c941dd28663a1ff13e62c9de4ff06c7596278 Mon Sep 17 00:00:00 2001 From: "femtocleaner[bot]" Date: Tue, 21 Aug 2018 16:11:33 +0000 Subject: [PATCH 02/12] Fix deprecations --- deps/build.jl | 4 +- src/avio.jl | 8 +- src/ffmpeg/AVCodecs/v53/avcodec.jl | 72 ++++++------- src/ffmpeg/AVCodecs/v53/libavcodec_h.jl | 94 ++++++++--------- src/ffmpeg/AVCodecs/v54/avcodec.jl | 84 +++++++-------- src/ffmpeg/AVCodecs/v54/libavcodec_h.jl | 90 ++++++++-------- src/ffmpeg/AVCodecs/v54/vdpau.jl | 2 +- src/ffmpeg/AVCodecs/v55/avcodec.jl | 84 +++++++-------- src/ffmpeg/AVCodecs/v55/libavcodec_h.jl | 90 ++++++++-------- src/ffmpeg/AVCodecs/v55/vdpau.jl | 2 +- src/ffmpeg/AVCodecs/v56/avcodec.jl | 84 +++++++-------- src/ffmpeg/AVCodecs/v56/libavcodec_h.jl | 88 ++++++++-------- src/ffmpeg/AVCodecs/v56/vdpau.jl | 2 +- src/ffmpeg/AVCodecs/v57/avcodec.jl | 78 +++++++------- src/ffmpeg/AVCodecs/v57/dirac.jl | 2 +- src/ffmpeg/AVCodecs/v57/libavcodec_h.jl | 92 ++++++++--------- src/ffmpeg/AVCodecs/v57/vdpau.jl | 2 +- src/ffmpeg/AVCodecs/v57/videotoolbox.jl | 2 +- src/ffmpeg/AVCodecs/v57/vorbis_parser.jl | 4 +- src/ffmpeg/AVDevice/v53/avdevice.jl | 10 +- src/ffmpeg/AVDevice/v55/avdevice.jl | 10 +- src/ffmpeg/AVDevice/v56/avdevice.jl | 10 +- src/ffmpeg/AVDevice/v57/avdevice.jl | 10 +- src/ffmpeg/AVFilters/v2/avfilter.jl | 50 ++++----- src/ffmpeg/AVFilters/v2/avfiltergraph.jl | 8 +- src/ffmpeg/AVFilters/v2/libavfilter_h.jl | 10 +- src/ffmpeg/AVFilters/v3/avfilter.jl | 32 +++--- src/ffmpeg/AVFilters/v3/buffersink.jl | 2 +- src/ffmpeg/AVFilters/v3/libavfilter_h.jl | 24 ++--- src/ffmpeg/AVFilters/v4/avfilter.jl | 32 +++--- src/ffmpeg/AVFilters/v4/buffersink.jl | 2 +- src/ffmpeg/AVFilters/v4/libavfilter_h.jl | 24 ++--- src/ffmpeg/AVFilters/v5/avfilter.jl | 32 +++--- src/ffmpeg/AVFilters/v5/buffersink.jl | 2 +- src/ffmpeg/AVFilters/v5/libavfilter_h.jl | 24 ++--- src/ffmpeg/AVFilters/v6/avfilter.jl | 26 ++--- src/ffmpeg/AVFilters/v6/buffersink.jl | 2 +- src/ffmpeg/AVFilters/v6/libavfilter_h.jl | 26 ++--- src/ffmpeg/AVFormat/v53/avformat.jl | 46 ++++----- src/ffmpeg/AVFormat/v53/avio.jl | 66 ++++++------ src/ffmpeg/AVFormat/v53/libavformat_h.jl | 78 +++++++------- src/ffmpeg/AVFormat/v54/avformat.jl | 48 ++++----- src/ffmpeg/AVFormat/v54/avio.jl | 26 ++--- src/ffmpeg/AVFormat/v54/libavformat_h.jl | 82 +++++++-------- src/ffmpeg/AVFormat/v55/avformat.jl | 48 ++++----- src/ffmpeg/AVFormat/v55/avio.jl | 26 ++--- src/ffmpeg/AVFormat/v55/libavformat_h.jl | 82 +++++++-------- src/ffmpeg/AVFormat/v56/avformat.jl | 44 ++++---- src/ffmpeg/AVFormat/v56/avio.jl | 26 ++--- src/ffmpeg/AVFormat/v56/libavformat_h.jl | 84 +++++++-------- src/ffmpeg/AVFormat/v57/avformat.jl | 52 +++++----- src/ffmpeg/AVFormat/v57/avio.jl | 28 ++--- src/ffmpeg/AVFormat/v57/libavformat_h.jl | 104 +++++++++---------- src/ffmpeg/AVUtil/v52/audio_fifo.jl | 8 +- src/ffmpeg/AVUtil/v52/avutil.jl | 6 +- src/ffmpeg/AVUtil/v52/buffer.jl | 12 +-- src/ffmpeg/AVUtil/v52/channel_layout.jl | 4 +- src/ffmpeg/AVUtil/v52/dict.jl | 4 +- src/ffmpeg/AVUtil/v52/display.jl | 4 +- src/ffmpeg/AVUtil/v52/fifo.jl | 12 +-- src/ffmpeg/AVUtil/v52/file.jl | 6 +- src/ffmpeg/AVUtil/v52/frame.jl | 30 +++--- src/ffmpeg/AVUtil/v52/hash.jl | 14 +-- src/ffmpeg/AVUtil/v52/imgutils.jl | 8 +- src/ffmpeg/AVUtil/v52/libavutil_h.jl | 40 ++++---- src/ffmpeg/AVUtil/v52/log.jl | 10 +- src/ffmpeg/AVUtil/v52/mem.jl | 40 ++++---- src/ffmpeg/AVUtil/v52/opt.jl | 106 +++++++++---------- src/ffmpeg/AVUtil/v52/pixdesc.jl | 6 +- src/ffmpeg/AVUtil/v52/threadmessage.jl | 10 +- src/ffmpeg/AVUtil/v52/timecode.jl | 4 +- src/ffmpeg/AVUtil/v52/xtea.jl | 4 +- src/ffmpeg/AVUtil/v54/audio_fifo.jl | 8 +- src/ffmpeg/AVUtil/v54/avutil.jl | 6 +- src/ffmpeg/AVUtil/v54/buffer.jl | 12 +-- src/ffmpeg/AVUtil/v54/channel_layout.jl | 4 +- src/ffmpeg/AVUtil/v54/dict.jl | 4 +- src/ffmpeg/AVUtil/v54/display.jl | 4 +- src/ffmpeg/AVUtil/v54/fifo.jl | 12 +-- src/ffmpeg/AVUtil/v54/file.jl | 6 +- src/ffmpeg/AVUtil/v54/frame.jl | 30 +++--- src/ffmpeg/AVUtil/v54/hash.jl | 14 +-- src/ffmpeg/AVUtil/v54/imgutils.jl | 8 +- src/ffmpeg/AVUtil/v54/libavutil_h.jl | 42 ++++---- src/ffmpeg/AVUtil/v54/log.jl | 10 +- src/ffmpeg/AVUtil/v54/mem.jl | 40 ++++---- src/ffmpeg/AVUtil/v54/opt.jl | 108 ++++++++++---------- src/ffmpeg/AVUtil/v54/pixdesc.jl | 6 +- src/ffmpeg/AVUtil/v54/pixelutils.jl | 2 +- src/ffmpeg/AVUtil/v54/threadmessage.jl | 10 +- src/ffmpeg/AVUtil/v54/timecode.jl | 4 +- src/ffmpeg/AVUtil/v54/xtea.jl | 4 +- src/ffmpeg/AVUtil/v55/aes_ctr.jl | 10 +- src/ffmpeg/AVUtil/v55/audio_fifo.jl | 10 +- src/ffmpeg/AVUtil/v55/avutil.jl | 6 +- src/ffmpeg/AVUtil/v55/buffer.jl | 12 +-- src/ffmpeg/AVUtil/v55/camellia.jl | 2 +- src/ffmpeg/AVUtil/v55/cast5.jl | 4 +- src/ffmpeg/AVUtil/v55/channel_layout.jl | 4 +- src/ffmpeg/AVUtil/v55/des.jl | 4 +- src/ffmpeg/AVUtil/v55/dict.jl | 2 +- src/ffmpeg/AVUtil/v55/display.jl | 4 +- src/ffmpeg/AVUtil/v55/fifo.jl | 16 +-- src/ffmpeg/AVUtil/v55/file.jl | 6 +- src/ffmpeg/AVUtil/v55/frame.jl | 30 +++--- src/ffmpeg/AVUtil/v55/hash.jl | 14 +-- src/ffmpeg/AVUtil/v55/imgutils.jl | 8 +- src/ffmpeg/AVUtil/v55/libavutil_h.jl | 42 ++++---- src/ffmpeg/AVUtil/v55/log.jl | 10 +- src/ffmpeg/AVUtil/v55/mem.jl | 42 ++++---- src/ffmpeg/AVUtil/v55/opencl.jl | 14 +-- src/ffmpeg/AVUtil/v55/opt.jl | 96 ++++++++--------- src/ffmpeg/AVUtil/v55/pixdesc.jl | 4 +- src/ffmpeg/AVUtil/v55/pixelutils.jl | 2 +- src/ffmpeg/AVUtil/v55/rc4.jl | 2 +- src/ffmpeg/AVUtil/v55/tea.jl | 4 +- src/ffmpeg/AVUtil/v55/threadmessage.jl | 14 +-- src/ffmpeg/AVUtil/v55/timecode.jl | 4 +- src/ffmpeg/AVUtil/v55/tree.jl | 10 +- src/ffmpeg/AVUtil/v55/twofish.jl | 2 +- src/ffmpeg/AVUtil/v55/xtea.jl | 8 +- src/ffmpeg/SWResample/v0/libswresample_h.jl | 2 +- src/ffmpeg/SWResample/v0/swresample.jl | 6 +- src/ffmpeg/SWScale/v2/libswscale_h.jl | 2 +- src/ffmpeg/SWScale/v2/swscale.jl | 24 ++--- src/ffmpeg/SWScale/v3/libswscale_h.jl | 2 +- src/ffmpeg/SWScale/v3/swscale.jl | 24 ++--- src/ffmpeg/SWScale/v4/libswscale_h.jl | 2 +- src/ffmpeg/SWScale/v4/swscale.jl | 24 ++--- src/init.jl | 2 +- src/libav/AVCodecs/v53/avcodec.jl | 72 ++++++------- src/libav/AVCodecs/v53/libavcodec_h.jl | 92 ++++++++--------- src/libav/AVCodecs/v54/avcodec.jl | 68 ++++++------ src/libav/AVCodecs/v54/libavcodec_h.jl | 90 ++++++++-------- src/libav/AVCodecs/v55/avcodec.jl | 62 +++++------ src/libav/AVCodecs/v55/libavcodec_h.jl | 76 +++++++------- src/libav/AVDevice/v53/avdevice.jl | 2 +- src/libav/AVDevice/v54/avdevice.jl | 2 +- src/libav/AVFilters/v2/avfilter.jl | 50 ++++----- src/libav/AVFilters/v2/avfiltergraph.jl | 8 +- src/libav/AVFilters/v2/libavfilter_h.jl | 10 +- src/libav/AVFilters/v3/avfilter.jl | 14 +-- src/libav/AVFilters/v3/avfiltergraph.jl | 10 +- src/libav/AVFilters/v3/libavfilter_h.jl | 12 +-- src/libav/AVFilters/v4/avfilter.jl | 24 ++--- src/libav/AVFilters/v4/libavfilter_h.jl | 20 ++-- src/libav/AVFormat/v53/avformat.jl | 46 ++++----- src/libav/AVFormat/v53/avio.jl | 66 ++++++------ src/libav/AVFormat/v53/libavformat_h.jl | 78 +++++++------- src/libav/AVFormat/v54/avformat.jl | 26 ++--- src/libav/AVFormat/v54/avio.jl | 26 ++--- src/libav/AVFormat/v54/libavformat_h.jl | 54 +++++----- src/libav/AVFormat/v55/avformat.jl | 24 ++--- src/libav/AVFormat/v55/avio.jl | 26 ++--- src/libav/AVFormat/v55/libavformat_h.jl | 56 +++++----- src/libav/AVResample/v1/avresample.jl | 4 +- src/libav/AVResample/v1/libavresample_h.jl | 2 +- src/libav/AVUtil/v51/audioconvert.jl | 2 +- src/libav/AVUtil/v51/dict.jl | 4 +- src/libav/AVUtil/v51/fifo.jl | 10 +- src/libav/AVUtil/v51/file.jl | 4 +- src/libav/AVUtil/v51/imgutils.jl | 8 +- src/libav/AVUtil/v51/libavutil_h.jl | 10 +- src/libav/AVUtil/v51/log.jl | 8 +- src/libav/AVUtil/v51/mem.jl | 10 +- src/libav/AVUtil/v51/opt.jl | 70 ++++++------- src/libav/AVUtil/v51/pixdesc.jl | 4 +- src/libav/AVUtil/v52/audio_fifo.jl | 8 +- src/libav/AVUtil/v52/channel_layout.jl | 2 +- src/libav/AVUtil/v52/dict.jl | 4 +- src/libav/AVUtil/v52/fifo.jl | 10 +- src/libav/AVUtil/v52/file.jl | 4 +- src/libav/AVUtil/v52/imgutils.jl | 8 +- src/libav/AVUtil/v52/libavutil_h.jl | 12 +-- src/libav/AVUtil/v52/log.jl | 8 +- src/libav/AVUtil/v52/mem.jl | 16 +-- src/libav/AVUtil/v52/opt.jl | 50 ++++----- src/libav/AVUtil/v52/pixdesc.jl | 4 +- src/libav/AVUtil/v52/xtea.jl | 4 +- src/libav/AVUtil/v53/audio_fifo.jl | 8 +- src/libav/AVUtil/v53/buffer.jl | 10 +- src/libav/AVUtil/v53/channel_layout.jl | 2 +- src/libav/AVUtil/v53/dict.jl | 4 +- src/libav/AVUtil/v53/fifo.jl | 10 +- src/libav/AVUtil/v53/file.jl | 4 +- src/libav/AVUtil/v53/frame.jl | 6 +- src/libav/AVUtil/v53/imgutils.jl | 8 +- src/libav/AVUtil/v53/libavutil_h.jl | 30 +++--- src/libav/AVUtil/v53/log.jl | 8 +- src/libav/AVUtil/v53/mem.jl | 26 ++--- src/libav/AVUtil/v53/opt.jl | 50 ++++----- src/libav/AVUtil/v53/pixdesc.jl | 4 +- src/libav/AVUtil/v53/xtea.jl | 4 +- src/libav/SWScale/v2/libswscale_h.jl | 2 +- src/libav/SWScale/v2/swscale.jl | 24 ++--- src/testvideos.jl | 2 +- src/util.jl | 4 +- test/avio.jl | 14 +-- util/archive/wrap_avbin.jl | 4 +- util/wrap_libav_split.jl | 4 +- 200 files changed, 2352 insertions(+), 2352 deletions(-) diff --git a/deps/build.jl b/deps/build.jl index 9b14007f..e0b7a850 100644 --- a/deps/build.jl +++ b/deps/build.jl @@ -26,14 +26,14 @@ libav_libs = [libavutil, libavcodec, libavformat, libavfilter, libswscale, libav # push!(libav_libs, libswresample) # end -if is_windows() +if Sys.iswindows() provides(Binaries, URI("http://ffmpeg.zeranoe.com/builds/win$WORD_SIZE/shared/ffmpeg-2.2.3-win$WORD_SIZE-shared.7z"), libav_libs, os = :Windows, unpacked_dir="ffmpeg-2.2.3-win$WORD_SIZE-shared/bin") end -if is_apple() +if Sys.isapple() using Homebrew provides( Homebrew.HB, "ffmpeg", libav_libs, os = :Darwin ) end diff --git a/src/avio.jl b/src/avio.jl index 471c24dc..f2e6a559 100644 --- a/src/avio.jl +++ b/src/avio.jl @@ -413,7 +413,7 @@ function retrieve!(r::VideoReader{TRANSCODE}, buf::VidArray{T}) where T<:EightBi end apSourceDataBuffers = isempty(r.frame_queue) ? reinterpret(Ptr{UInt8}, [r.aVideoFrame[1].data]) : - reinterpret(Ptr{UInt8}, [shift!(r.frame_queue)]) + reinterpret(Ptr{UInt8}, [popfirst!(r.frame_queue)]) apSourceLineSizes = reinterpret(Cint, [r.aVideoFrame[1].linesize]) Base.sigatomic_begin() @@ -659,7 +659,7 @@ if have_avdevice() return CAMERA_DEVICES end - if is_windows() + if Sys.iswindows() ffmpeg = joinpath(dirname(@__FILE__), "..", "deps", "ffmpeg-2.2.3-win$WORD_SIZE-shared", "bin", "ffmpeg.exe") DEFAULT_CAMERA_FORMAT = AVFormat.av_find_input_format("dshow") @@ -668,14 +668,14 @@ if have_avdevice() end - if is_linux() + if Sys.islinux() import Glob DEFAULT_CAMERA_FORMAT = AVFormat.av_find_input_format("video4linux2") CAMERA_DEVICES = Glob.glob("video*", "/dev") DEFAULT_CAMERA_DEVICE = length(CAMERA_DEVICES) > 0 ? CAMERA_DEVICES[1] : "" end - if is_apple() + if Sys.isapple() ffmpeg = joinpath(INSTALL_ROOT, "bin", "ffmpeg") DEFAULT_CAMERA_FORMAT = AVFormat.av_find_input_format("avfoundation") diff --git a/src/ffmpeg/AVCodecs/v53/avcodec.jl b/src/ffmpeg/AVCodecs/v53/avcodec.jl index 0cf8ced0..e5289f19 100644 --- a/src/ffmpeg/AVCodecs/v53/avcodec.jl +++ b/src/ffmpeg/AVCodecs/v53/avcodec.jl @@ -111,15 +111,15 @@ export function av_destruct_packet_nofree(pkt) - ccall((:av_destruct_packet_nofree,libavcodec),Void,(Ptr{AVPacket},),pkt) + ccall((:av_destruct_packet_nofree,libavcodec),Cvoid,(Ptr{AVPacket},),pkt) end function av_destruct_packet(pkt) - ccall((:av_destruct_packet,libavcodec),Void,(Ptr{AVPacket},),pkt) + ccall((:av_destruct_packet,libavcodec),Cvoid,(Ptr{AVPacket},),pkt) end function av_init_packet(pkt) - ccall((:av_init_packet,libavcodec),Void,(Ptr{AVPacket},),pkt) + ccall((:av_init_packet,libavcodec),Cvoid,(Ptr{AVPacket},),pkt) end function av_new_packet(pkt,size::Integer) @@ -127,7 +127,7 @@ function av_new_packet(pkt,size::Integer) end function av_shrink_packet(pkt,size::Integer) - ccall((:av_shrink_packet,libavcodec),Void,(Ptr{AVPacket},Cint),pkt,size) + ccall((:av_shrink_packet,libavcodec),Cvoid,(Ptr{AVPacket},Cint),pkt,size) end function av_grow_packet(pkt,grow_by::Integer) @@ -139,7 +139,7 @@ function av_dup_packet(pkt) end function av_free_packet(pkt) - ccall((:av_free_packet,libavcodec),Void,(Ptr{AVPacket},),pkt) + ccall((:av_free_packet,libavcodec),Cvoid,(Ptr{AVPacket},),pkt) end function av_packet_new_side_data(pkt,_type::AVPacketSideDataType,size::Integer) @@ -159,7 +159,7 @@ function audio_resample(s,output,input,nb_samples::Integer) end function audio_resample_close(s) - ccall((:audio_resample_close,libavcodec),Void,(Ptr{ReSampleContext},),s) + ccall((:audio_resample_close,libavcodec),Cvoid,(Ptr{ReSampleContext},),s) end function av_resample_init(out_rate::Integer,in_rate::Integer,filter_length::Integer,log2_phase_count::Integer,linear::Integer,cutoff::Cdouble) @@ -171,11 +171,11 @@ function av_resample(c,dst,src,consumed,src_size::Integer,dst_size::Integer,upda end function av_resample_compensate(c,sample_delta::Integer,compensation_distance::Integer) - ccall((:av_resample_compensate,libavcodec),Void,(Ptr{AVResampleContext},Cint,Cint),c,sample_delta,compensation_distance) + ccall((:av_resample_compensate,libavcodec),Cvoid,(Ptr{AVResampleContext},Cint,Cint),c,sample_delta,compensation_distance) end function av_resample_close(c) - ccall((:av_resample_close,libavcodec),Void,(Ptr{AVResampleContext},),c) + ccall((:av_resample_close,libavcodec),Cvoid,(Ptr{AVResampleContext},),c) end function avpicture_alloc(picture,pix_fmt::PixelFormat,width::Integer,height::Integer) @@ -183,7 +183,7 @@ function avpicture_alloc(picture,pix_fmt::PixelFormat,width::Integer,height::Int end function avpicture_free(picture) - ccall((:avpicture_free,libavcodec),Void,(Ptr{AVPicture},),picture) + ccall((:avpicture_free,libavcodec),Cvoid,(Ptr{AVPicture},),picture) end function avpicture_fill(picture,ptr,pix_fmt::PixelFormat,width::Integer,height::Integer) @@ -199,7 +199,7 @@ function avpicture_get_size(pix_fmt::PixelFormat,width::Integer,height::Integer) end function avcodec_get_chroma_sub_sample(pix_fmt::PixelFormat,h_shift,v_shift) - ccall((:avcodec_get_chroma_sub_sample,libavcodec),Void,(PixelFormat,Ptr{Cint},Ptr{Cint}),pix_fmt,h_shift,v_shift) + ccall((:avcodec_get_chroma_sub_sample,libavcodec),Cvoid,(PixelFormat,Ptr{Cint},Ptr{Cint}),pix_fmt,h_shift,v_shift) end function avcodec_get_pix_fmt_name(pix_fmt::PixelFormat) @@ -207,7 +207,7 @@ function avcodec_get_pix_fmt_name(pix_fmt::PixelFormat) end function avcodec_set_dimensions(s,width::Integer,height::Integer) - ccall((:avcodec_set_dimensions,libavcodec),Void,(Ptr{AVCodecContext},Cint,Cint),s,width,height) + ccall((:avcodec_set_dimensions,libavcodec),Cvoid,(Ptr{AVCodecContext},Cint,Cint),s,width,height) end function avcodec_pix_fmt_to_codec_tag(pix_fmt::PixelFormat) @@ -251,11 +251,11 @@ function avcodec_license() end function avcodec_init() - ccall((:avcodec_init,libavcodec),Void,()) + ccall((:avcodec_init,libavcodec),Cvoid,()) end function avcodec_register(codec) - ccall((:avcodec_register,libavcodec),Void,(Ptr{AVCodec},),codec) + ccall((:avcodec_register,libavcodec),Cvoid,(Ptr{AVCodec},),codec) end function avcodec_find_encoder(id::CodecID) @@ -275,7 +275,7 @@ function avcodec_find_decoder_by_name(name) end function avcodec_string(buf,buf_size::Integer,enc,encode::Integer) - ccall((:avcodec_string,libavcodec),Void,(Ptr{UInt8},Cint,Ptr{AVCodecContext},Cint),buf,buf_size,enc,encode) + ccall((:avcodec_string,libavcodec),Cvoid,(Ptr{UInt8},Cint,Ptr{AVCodecContext},Cint),buf,buf_size,enc,encode) end function av_get_profile_name(codec,profile::Integer) @@ -283,11 +283,11 @@ function av_get_profile_name(codec,profile::Integer) end function avcodec_get_context_defaults(s) - ccall((:avcodec_get_context_defaults,libavcodec),Void,(Ptr{AVCodecContext},),s) + ccall((:avcodec_get_context_defaults,libavcodec),Cvoid,(Ptr{AVCodecContext},),s) end function avcodec_get_context_defaults2(s,arg1::AVMediaType) - ccall((:avcodec_get_context_defaults2,libavcodec),Void,(Ptr{AVCodecContext},AVMediaType),s,arg1) + ccall((:avcodec_get_context_defaults2,libavcodec),Cvoid,(Ptr{AVCodecContext},AVMediaType),s,arg1) end function avcodec_get_context_defaults3(s,codec) @@ -311,7 +311,7 @@ function avcodec_copy_context(dest,src) end function avcodec_get_frame_defaults(pic) - ccall((:avcodec_get_frame_defaults,libavcodec),Void,(Ptr{AVFrame},),pic) + ccall((:avcodec_get_frame_defaults,libavcodec),Cvoid,(Ptr{AVFrame},),pic) end function avcodec_alloc_frame() @@ -323,7 +323,7 @@ function avcodec_default_get_buffer(s,pic) end function avcodec_default_release_buffer(s,pic) - ccall((:avcodec_default_release_buffer,libavcodec),Void,(Ptr{AVCodecContext},Ptr{AVFrame}),s,pic) + ccall((:avcodec_default_release_buffer,libavcodec),Cvoid,(Ptr{AVCodecContext},Ptr{AVFrame}),s,pic) end function avcodec_default_reget_buffer(s,pic) @@ -335,11 +335,11 @@ function avcodec_get_edge_width() end function avcodec_align_dimensions(s,width,height) - ccall((:avcodec_align_dimensions,libavcodec),Void,(Ptr{AVCodecContext},Ptr{Cint},Ptr{Cint}),s,width,height) + ccall((:avcodec_align_dimensions,libavcodec),Cvoid,(Ptr{AVCodecContext},Ptr{Cint},Ptr{Cint}),s,width,height) end function avcodec_align_dimensions2(s,width,height,linesize_align) - ccall((:avcodec_align_dimensions2,libavcodec),Void,(Ptr{AVCodecContext},Ptr{Cint},Ptr{Cint},Ptr{Cint}),s,width,height,linesize_align) + ccall((:avcodec_align_dimensions2,libavcodec),Cvoid,(Ptr{AVCodecContext},Ptr{Cint},Ptr{Cint},Ptr{Cint}),s,width,height,linesize_align) end function avcodec_default_get_format(s,fmt) @@ -351,11 +351,11 @@ function avcodec_thread_init(s,thread_count::Integer) end function avcodec_default_execute(c,func,arg,ret,count::Integer,size::Integer) - ccall((:avcodec_default_execute,libavcodec),Cint,(Ptr{AVCodecContext},Ptr{Void},Ptr{Void},Ptr{Cint},Cint,Cint),c,func,arg,ret,count,size) + ccall((:avcodec_default_execute,libavcodec),Cint,(Ptr{AVCodecContext},Ptr{Cvoid},Ptr{Cvoid},Ptr{Cint},Cint,Cint),c,func,arg,ret,count,size) end function avcodec_default_execute2(c,func,arg,ret,count::Integer) - ccall((:avcodec_default_execute2,libavcodec),Cint,(Ptr{AVCodecContext},Ptr{Void},Ptr{Void},Ptr{Cint},Cint),c,func,arg,ret,count) + ccall((:avcodec_default_execute2,libavcodec),Cint,(Ptr{AVCodecContext},Ptr{Cvoid},Ptr{Cvoid},Ptr{Cint},Cint),c,func,arg,ret,count) end function avcodec_open(avctx,codec) @@ -383,7 +383,7 @@ function avcodec_decode_subtitle2(avctx,sub,got_sub_ptr,avpkt) end function avsubtitle_free(sub) - ccall((:avsubtitle_free,libavcodec),Void,(Ptr{AVSubtitle},),sub) + ccall((:avsubtitle_free,libavcodec),Cvoid,(Ptr{AVSubtitle},),sub) end function avcodec_encode_audio(avctx,buf,buf_size::Integer,samples) @@ -411,15 +411,15 @@ function avcodec_close(avctx) end function avcodec_register_all() - ccall((:avcodec_register_all,libavcodec),Void,()) + ccall((:avcodec_register_all,libavcodec),Cvoid,()) end function avcodec_flush_buffers(avctx) - ccall((:avcodec_flush_buffers,libavcodec),Void,(Ptr{AVCodecContext},),avctx) + ccall((:avcodec_flush_buffers,libavcodec),Cvoid,(Ptr{AVCodecContext},),avctx) end function avcodec_default_free_buffers(s) - ccall((:avcodec_default_free_buffers,libavcodec),Void,(Ptr{AVCodecContext},),s) + ccall((:avcodec_default_free_buffers,libavcodec),Cvoid,(Ptr{AVCodecContext},),s) end function av_get_pict_type_char(pict_type::Integer) @@ -439,7 +439,7 @@ function av_parser_next(c) end function av_register_codec_parser(parser) - ccall((:av_register_codec_parser,libavcodec),Void,(Ptr{AVCodecParser},),parser) + ccall((:av_register_codec_parser,libavcodec),Cvoid,(Ptr{AVCodecParser},),parser) end function av_parser_init(codec_id::Integer) @@ -455,11 +455,11 @@ function av_parser_change(s,avctx,poutbuf,poutbuf_size,buf,buf_size::Integer,key end function av_parser_close(s) - ccall((:av_parser_close,libavcodec),Void,(Ptr{AVCodecParserContext},),s) + ccall((:av_parser_close,libavcodec),Cvoid,(Ptr{AVCodecParserContext},),s) end function av_register_bitstream_filter(bsf) - ccall((:av_register_bitstream_filter,libavcodec),Void,(Ptr{AVBitStreamFilter},),bsf) + ccall((:av_register_bitstream_filter,libavcodec),Cvoid,(Ptr{AVBitStreamFilter},),bsf) end function av_bitstream_filter_init(name) @@ -471,7 +471,7 @@ function av_bitstream_filter_filter(bsfc,avctx,args,poutbuf,poutbuf_size,buf,buf end function av_bitstream_filter_close(bsf) - ccall((:av_bitstream_filter_close,libavcodec),Void,(Ptr{AVBitStreamFilterContext},),bsf) + ccall((:av_bitstream_filter_close,libavcodec),Cvoid,(Ptr{AVBitStreamFilterContext},),bsf) end function av_bitstream_filter_next(f) @@ -479,15 +479,15 @@ function av_bitstream_filter_next(f) end function av_fast_realloc(ptr,size,min_size::Csize_t) - ccall((:av_fast_realloc,libavcodec),Ptr{Void},(Ptr{Void},Ptr{UInt32},Csize_t),ptr,size,min_size) + ccall((:av_fast_realloc,libavcodec),Ptr{Cvoid},(Ptr{Cvoid},Ptr{UInt32},Csize_t),ptr,size,min_size) end function av_fast_malloc(ptr,size,min_size::Csize_t) - ccall((:av_fast_malloc,libavcodec),Void,(Ptr{Void},Ptr{UInt32},Csize_t),ptr,size,min_size) + ccall((:av_fast_malloc,libavcodec),Cvoid,(Ptr{Cvoid},Ptr{UInt32},Csize_t),ptr,size,min_size) end function av_picture_copy(dst,src,pix_fmt::PixelFormat,width::Integer,height::Integer) - ccall((:av_picture_copy,libavcodec),Void,(Ptr{AVPicture},Ptr{AVPicture},PixelFormat,Cint,Cint),dst,src,pix_fmt,width,height) + ccall((:av_picture_copy,libavcodec),Cvoid,(Ptr{AVPicture},Ptr{AVPicture},PixelFormat,Cint,Cint),dst,src,pix_fmt,width,height) end function av_picture_crop(dst,src,pix_fmt::PixelFormat,top_band::Integer,left_band::Integer) @@ -503,11 +503,11 @@ function av_xiphlacing(s,v::Integer) end function av_log_missing_feature(avc,feature,want_sample::Integer) - ccall((:av_log_missing_feature,libavcodec),Void,(Ptr{Void},Ptr{UInt8},Cint),avc,feature,want_sample) + ccall((:av_log_missing_feature,libavcodec),Cvoid,(Ptr{Cvoid},Ptr{UInt8},Cint),avc,feature,want_sample) end function av_register_hwaccel(hwaccel) - ccall((:av_register_hwaccel,libavcodec),Void,(Ptr{AVHWAccel},),hwaccel) + ccall((:av_register_hwaccel,libavcodec),Cvoid,(Ptr{AVHWAccel},),hwaccel) end function av_hwaccel_next(hwaccel) @@ -515,7 +515,7 @@ function av_hwaccel_next(hwaccel) end function av_lockmgr_register(cb) - ccall((:av_lockmgr_register,libavcodec),Cint,(Ptr{Void},),cb) + ccall((:av_lockmgr_register,libavcodec),Cint,(Ptr{Cvoid},),cb) end function avcodec_get_type(codec_id::CodecID) diff --git a/src/ffmpeg/AVCodecs/v53/libavcodec_h.jl b/src/ffmpeg/AVCodecs/v53/libavcodec_h.jl index ba24a684..159e03fc 100644 --- a/src/ffmpeg/AVCodecs/v53/libavcodec_h.jl +++ b/src/ffmpeg/AVCodecs/v53/libavcodec_h.jl @@ -1420,11 +1420,11 @@ struct AVPacket size::Cint stream_index::Cint flags::Cint - side_data::Ptr{Void} + side_data::Ptr{Cvoid} side_data_elems::Cint duration::Cint - destruct::Ptr{Void} - priv::Ptr{Void} + destruct::Ptr{Cvoid} + priv::Ptr{Cvoid} pos::Int64 convergence_duration::Int64 end @@ -1456,8 +1456,8 @@ end zero(::Type{Array_4_Cint}) = Array_4_Cint(fill(zero(Cint),4)...) struct Array_2_Ptr - d1::Ptr{Void} - d2::Ptr{Void} + d1::Ptr{Cvoid} + d2::Ptr{Cvoid} end zero(::Type{Array_2_Ptr}) = Array_2_Ptr(fill(C_NULL,2)...) @@ -1476,20 +1476,20 @@ struct AVProfile name::Ptr{UInt8} end -const AVCodecDefault = Void +const AVCodecDefault = Nothing struct AVCodec name::Ptr{UInt8} _type::AVMediaType id::CodecID priv_data_size::Cint - init::Ptr{Void} - encode::Ptr{Void} - close::Ptr{Void} - decode::Ptr{Void} + init::Ptr{Cvoid} + encode::Ptr{Cvoid} + close::Ptr{Cvoid} + decode::Ptr{Cvoid} capabilities::Cint next::Ptr{AVCodec} - flush::Ptr{Void} + flush::Ptr{Cvoid} supported_framerates::Ptr{AVRational} pix_fmts::Ptr{PixelFormat} long_name::Ptr{UInt8} @@ -1499,11 +1499,11 @@ struct AVCodec max_lowres::UInt8 priv_class::Ptr{AVClass} profiles::Ptr{AVProfile} - init_thread_copy::Ptr{Void} - update_thread_context::Ptr{Void} + init_thread_copy::Ptr{Cvoid} + update_thread_context::Ptr{Cvoid} defaults::Ptr{AVCodecDefault} - init_static_data::Ptr{Void} - encode2::Ptr{Void} + init_static_data::Ptr{Cvoid} + encode2::Ptr{Cvoid} end struct Array_32_Uint8 @@ -1816,13 +1816,13 @@ struct AVHWAccel pix_fmt::PixelFormat capabilities::Cint next::Ptr{AVHWAccel} - start_frame::Ptr{Void} - decode_slice::Ptr{Void} - end_frame::Ptr{Void} + start_frame::Ptr{Cvoid} + decode_slice::Ptr{Cvoid} + end_frame::Ptr{Cvoid} priv_data_size::Cint end -const AVCodecInternal = Void +const AVCodecInternal = Nothing # begin enum AVFieldOrder const AVFieldOrder = UInt32 @@ -1848,7 +1848,7 @@ struct AVCodecContext height::Cint gop_size::Cint pix_fmt::PixelFormat - draw_horiz_band::Ptr{Void} + draw_horiz_band::Ptr{Cvoid} sample_rate::Cint channels::Cint sample_fmt::AVSampleFormat @@ -1865,9 +1865,9 @@ struct AVCodecContext rc_strategy::Cint b_frame_strategy::Cint codec::Ptr{AVCodec} - priv_data::Ptr{Void} + priv_data::Ptr{Cvoid} rtp_payload_size::Cint - rtp_callback::Ptr{Void} + rtp_callback::Ptr{Cvoid} mv_bits::Cint header_bits::Cint i_tex_bits::Cint @@ -1877,7 +1877,7 @@ struct AVCodecContext skip_count::Cint misc_bits::Cint frame_bits::Cint - opaque::Ptr{Void} + opaque::Ptr{Cvoid} codec_name::Array_32_Uint8 codec_type::AVMediaType codec_id::CodecID @@ -1888,8 +1888,8 @@ struct AVCodecContext strict_std_compliance::Cint b_quant_offset::Cfloat error_recognition::Cint - get_buffer::Ptr{Void} - release_buffer::Ptr{Void} + get_buffer::Ptr{Cvoid} + release_buffer::Ptr{Cvoid} has_b_frames::Cint block_align::Cint parse_only::Cint @@ -1937,14 +1937,14 @@ struct AVCodecContext me_pre_cmp::Cint pre_dia_size::Cint me_subpel_quality::Cint - get_format::Ptr{Void} + get_format::Ptr{Cvoid} dtg_active_format::Cint me_range::Cint intra_quant_bias::Cint inter_quant_bias::Cint color_table_id::Cint internal_buffer_count::Cint - internal_buffer::Ptr{Void} + internal_buffer::Ptr{Cvoid} global_quality::Cint coder_type::Cint context_model::Cint @@ -1959,7 +1959,7 @@ struct AVCodecContext lmax::Cint palctrl::Ptr{AVPaletteControl} noise_reduction::Cint - reget_buffer::Ptr{Void} + reget_buffer::Ptr{Cvoid} rc_initial_buffer_occupancy::Cint inter_threshold::Cint flags2::Cint @@ -1967,8 +1967,8 @@ struct AVCodecContext antialias_algo::Cint quantizer_noise_shaping::Cint thread_count::Cint - execute::Ptr{Void} - thread_opaque::Ptr{Void} + execute::Ptr{Cvoid} + thread_opaque::Ptr{Cvoid} me_threshold::Cint mb_threshold::Cint intra_dc_precision::Cint @@ -2027,13 +2027,13 @@ struct AVCodecContext rc_min_vbv_overflow_use::Cfloat hwaccel::Ptr{AVHWAccel} ticks_per_frame::Cint - hwaccel_context::Ptr{Void} + hwaccel_context::Ptr{Cvoid} color_primaries::AVColorPrimaries color_trc::AVColorTransferCharacteristic colorspace::AVColorSpace color_range::AVColorRange chroma_sample_location::AVChromaLocation - execute2::Ptr{Void} + execute2::Ptr{Cvoid} weighted_p_pred::Cint aq_mode::Cint aq_strength::Cfloat @@ -2078,7 +2078,7 @@ struct AVFrame motion_val::Array_2_Ptr mb_type::Ptr{UInt32} motion_subsample_log2::UInt8 - opaque::Ptr{Void} + opaque::Ptr{Cvoid} error::Array_4_Uint64 _type::Cint repeat_pict::Cint @@ -2091,11 +2091,11 @@ struct AVFrame dct_coeff::Ptr{Int16} ref_index::Array_2_Ptr reordered_opaque::Int64 - hwaccel_picture_private::Ptr{Void} + hwaccel_picture_private::Ptr{Cvoid} pkt_pts::Int64 pkt_dts::Int64 owner::Ptr{AVCodecContext} - thread_opaque::Ptr{Void} + thread_opaque::Ptr{Cvoid} nb_samples::Cint extended_data::Ptr{Ptr{UInt8}} sample_aspect_ratio::AVRational @@ -2138,8 +2138,8 @@ struct AVSubtitle pts::Int64 end -const ReSampleContext = Void -const AVResampleContext = Void +const ReSampleContext = Nothing +const AVResampleContext = Nothing struct Array_4_Int64 d1::Int64 @@ -2163,15 +2163,15 @@ zero(::Type{Array_5_Cint}) = Array_5_Cint(fill(zero(Cint),5)...) struct AVCodecParser codec_ids::Array_5_Cint priv_data_size::Cint - parser_init::Ptr{Void} - parser_parse::Ptr{Void} - parser_close::Ptr{Void} - split::Ptr{Void} + parser_init::Ptr{Cvoid} + parser_parse::Ptr{Cvoid} + parser_close::Ptr{Cvoid} + split::Ptr{Cvoid} next::Ptr{AVCodecParser} end struct AVCodecParserContext - priv_data::Ptr{Void} + priv_data::Ptr{Cvoid} parser::Ptr{AVCodecParser} frame_offset::Int64 cur_offset::Int64 @@ -2203,13 +2203,13 @@ end struct AVBitStreamFilter name::Ptr{UInt8} priv_data_size::Cint - filter::Ptr{Void} - close::Ptr{Void} + filter::Ptr{Cvoid} + close::Ptr{Cvoid} next::Ptr{AVBitStreamFilter} end struct AVBitStreamFilterContext - priv_data::Ptr{Void} + priv_data::Ptr{Cvoid} filter::Ptr{AVBitStreamFilter} parser::Ptr{AVCodecParserContext} next::Ptr{AVBitStreamFilterContext} @@ -2263,7 +2263,7 @@ const LIBAVCODEC_BUILD = LIBAVCODEC_VERSION_INT # Skipping MacroDefinition: FF_API_OLD_ENCODE_AUDIO ( LIBAVCODEC_VERSION_MAJOR < 54 ) struct vaapi_context - display::Ptr{Void} + display::Ptr{Cvoid} config_id::UInt32 context_id::UInt32 pic_param_buf_id::UInt32 @@ -2272,7 +2272,7 @@ struct vaapi_context slice_buf_ids::Ptr{UInt32} n_slice_buf_ids::UInt32 slice_buf_ids_alloc::UInt32 - slice_params::Ptr{Void} + slice_params::Ptr{Cvoid} slice_param_size::UInt32 slice_params_alloc::UInt32 slice_count::UInt32 diff --git a/src/ffmpeg/AVCodecs/v54/avcodec.jl b/src/ffmpeg/AVCodecs/v54/avcodec.jl index 10883805..dd556593 100644 --- a/src/ffmpeg/AVCodecs/v54/avcodec.jl +++ b/src/ffmpeg/AVCodecs/v54/avcodec.jl @@ -146,7 +146,7 @@ function av_codec_get_pkt_timebase(avctx) end function av_codec_set_pkt_timebase(avctx,val::AVRational) - ccall((:av_codec_set_pkt_timebase,libavcodec),Void,(Ptr{AVCodecContext},AVRational),avctx,val) + ccall((:av_codec_set_pkt_timebase,libavcodec),Cvoid,(Ptr{AVCodecContext},AVRational),avctx,val) end function av_codec_get_codec_descriptor(avctx) @@ -154,7 +154,7 @@ function av_codec_get_codec_descriptor(avctx) end function av_codec_set_codec_descriptor(avctx,desc) - ccall((:av_codec_set_codec_descriptor,libavcodec),Void,(Ptr{AVCodecContext},Ptr{AVCodecDescriptor}),avctx,desc) + ccall((:av_codec_set_codec_descriptor,libavcodec),Cvoid,(Ptr{AVCodecContext},Ptr{AVCodecDescriptor}),avctx,desc) end function av_codec_get_lowres(avctx) @@ -162,7 +162,7 @@ function av_codec_get_lowres(avctx) end function av_codec_set_lowres(avctx,val::Integer) - ccall((:av_codec_set_lowres,libavcodec),Void,(Ptr{AVCodecContext},Cint),avctx,val) + ccall((:av_codec_set_lowres,libavcodec),Cvoid,(Ptr{AVCodecContext},Cint),avctx,val) end function av_codec_get_seek_preroll(avctx) @@ -170,7 +170,7 @@ function av_codec_get_seek_preroll(avctx) end function av_codec_set_seek_preroll(avctx,val::Integer) - ccall((:av_codec_set_seek_preroll,libavcodec),Void,(Ptr{AVCodecContext},Cint),avctx,val) + ccall((:av_codec_set_seek_preroll,libavcodec),Cvoid,(Ptr{AVCodecContext},Cint),avctx,val) end function av_codec_get_chroma_intra_matrix(avctx) @@ -178,7 +178,7 @@ function av_codec_get_chroma_intra_matrix(avctx) end function av_codec_set_chroma_intra_matrix(avctx,val) - ccall((:av_codec_set_chroma_intra_matrix,libavcodec),Void,(Ptr{AVCodecContext},Ptr{UInt16}),avctx,val) + ccall((:av_codec_set_chroma_intra_matrix,libavcodec),Cvoid,(Ptr{AVCodecContext},Ptr{UInt16}),avctx,val) end function av_codec_get_max_lowres(codec) @@ -202,11 +202,11 @@ function avcodec_license() end function avcodec_register(codec) - ccall((:avcodec_register,libavcodec),Void,(Ptr{AVCodec},),codec) + ccall((:avcodec_register,libavcodec),Cvoid,(Ptr{AVCodec},),codec) end function avcodec_register_all() - ccall((:avcodec_register_all,libavcodec),Void,()) + ccall((:avcodec_register_all,libavcodec),Cvoid,()) end function avcodec_alloc_context3(codec) @@ -214,7 +214,7 @@ function avcodec_alloc_context3(codec) end function avcodec_free_context(avctx) - ccall((:avcodec_free_context,libavcodec),Void,(Ptr{Ptr{AVCodecContext}},),avctx) + ccall((:avcodec_free_context,libavcodec),Cvoid,(Ptr{Ptr{AVCodecContext}},),avctx) end function avcodec_get_context_defaults3(s,codec) @@ -242,11 +242,11 @@ function avcodec_alloc_frame() end function avcodec_get_frame_defaults(frame) - ccall((:avcodec_get_frame_defaults,libavcodec),Void,(Ptr{AVFrame},),frame) + ccall((:avcodec_get_frame_defaults,libavcodec),Cvoid,(Ptr{AVFrame},),frame) end function avcodec_free_frame(frame) - ccall((:avcodec_free_frame,libavcodec),Void,(Ptr{Ptr{AVFrame}},),frame) + ccall((:avcodec_free_frame,libavcodec),Cvoid,(Ptr{Ptr{AVFrame}},),frame) end function avcodec_open2(avctx,codec,options) @@ -258,15 +258,15 @@ function avcodec_close(avctx) end function avsubtitle_free(sub) - ccall((:avsubtitle_free,libavcodec),Void,(Ptr{AVSubtitle},),sub) + ccall((:avsubtitle_free,libavcodec),Cvoid,(Ptr{AVSubtitle},),sub) end function av_destruct_packet(pkt) - ccall((:av_destruct_packet,libavcodec),Void,(Ptr{AVPacket},),pkt) + ccall((:av_destruct_packet,libavcodec),Cvoid,(Ptr{AVPacket},),pkt) end function av_init_packet(pkt) - ccall((:av_init_packet,libavcodec),Void,(Ptr{AVPacket},),pkt) + ccall((:av_init_packet,libavcodec),Cvoid,(Ptr{AVPacket},),pkt) end function av_new_packet(pkt,size::Integer) @@ -274,7 +274,7 @@ function av_new_packet(pkt,size::Integer) end function av_shrink_packet(pkt,size::Integer) - ccall((:av_shrink_packet,libavcodec),Void,(Ptr{AVPacket},Cint),pkt,size) + ccall((:av_shrink_packet,libavcodec),Cvoid,(Ptr{AVPacket},Cint),pkt,size) end function av_grow_packet(pkt,grow_by::Integer) @@ -298,7 +298,7 @@ function av_copy_packet_side_data(dst,src) end function av_free_packet(pkt) - ccall((:av_free_packet,libavcodec),Void,(Ptr{AVPacket},),pkt) + ccall((:av_free_packet,libavcodec),Cvoid,(Ptr{AVPacket},),pkt) end function av_packet_new_side_data(pkt,_type::AVPacketSideDataType,size::Integer) @@ -330,7 +330,7 @@ function av_packet_unpack_dictionary(data,size::Integer,dict) end function av_packet_free_side_data(pkt) - ccall((:av_packet_free_side_data,libavcodec),Void,(Ptr{AVPacket},),pkt) + ccall((:av_packet_free_side_data,libavcodec),Cvoid,(Ptr{AVPacket},),pkt) end function av_packet_ref(dst,src) @@ -338,11 +338,11 @@ function av_packet_ref(dst,src) end function av_packet_unref(pkt) - ccall((:av_packet_unref,libavcodec),Void,(Ptr{AVPacket},),pkt) + ccall((:av_packet_unref,libavcodec),Cvoid,(Ptr{AVPacket},),pkt) end function av_packet_move_ref(dst,src) - ccall((:av_packet_move_ref,libavcodec),Void,(Ptr{AVPacket},Ptr{AVPacket}),dst,src) + ccall((:av_packet_move_ref,libavcodec),Cvoid,(Ptr{AVPacket},Ptr{AVPacket}),dst,src) end function av_packet_copy_props(dst,src) @@ -350,7 +350,7 @@ function av_packet_copy_props(dst,src) end function av_packet_rescale_ts(pkt,tb_src::AVRational,tb_dst::AVRational) - ccall((:av_packet_rescale_ts,libavcodec),Void,(Ptr{AVPacket},AVRational,AVRational),pkt,tb_src,tb_dst) + ccall((:av_packet_rescale_ts,libavcodec),Cvoid,(Ptr{AVPacket},AVRational,AVRational),pkt,tb_src,tb_dst) end function avcodec_find_decoder(id::AVCodecID) @@ -366,7 +366,7 @@ function avcodec_default_get_buffer(s,pic) end function avcodec_default_release_buffer(s,pic) - ccall((:avcodec_default_release_buffer,libavcodec),Void,(Ptr{AVCodecContext},Ptr{AVFrame}),s,pic) + ccall((:avcodec_default_release_buffer,libavcodec),Cvoid,(Ptr{AVCodecContext},Ptr{AVFrame}),s,pic) end function avcodec_default_reget_buffer(s,pic) @@ -382,11 +382,11 @@ function avcodec_get_edge_width() end function avcodec_align_dimensions(s,width,height) - ccall((:avcodec_align_dimensions,libavcodec),Void,(Ptr{AVCodecContext},Ptr{Cint},Ptr{Cint}),s,width,height) + ccall((:avcodec_align_dimensions,libavcodec),Cvoid,(Ptr{AVCodecContext},Ptr{Cint},Ptr{Cint}),s,width,height) end function avcodec_align_dimensions2(s,width,height,linesize_align) - ccall((:avcodec_align_dimensions2,libavcodec),Void,(Ptr{AVCodecContext},Ptr{Cint},Ptr{Cint},Ptr{Cint}),s,width,height,linesize_align) + ccall((:avcodec_align_dimensions2,libavcodec),Cvoid,(Ptr{AVCodecContext},Ptr{Cint},Ptr{Cint},Ptr{Cint}),s,width,height,linesize_align) end function avcodec_enum_to_chroma_pos(xpos,ypos,pos::AVChromaLocation) @@ -418,7 +418,7 @@ function av_parser_next(c) end function av_register_codec_parser(parser) - ccall((:av_register_codec_parser,libavcodec),Void,(Ptr{AVCodecParser},),parser) + ccall((:av_register_codec_parser,libavcodec),Cvoid,(Ptr{AVCodecParser},),parser) end function av_parser_init(codec_id::Integer) @@ -434,7 +434,7 @@ function av_parser_change(s,avctx,poutbuf,poutbuf_size,buf,buf_size::Integer,key end function av_parser_close(s) - ccall((:av_parser_close,libavcodec),Void,(Ptr{AVCodecParserContext},),s) + ccall((:av_parser_close,libavcodec),Cvoid,(Ptr{AVCodecParserContext},),s) end function avcodec_find_encoder(id::AVCodecID) @@ -474,7 +474,7 @@ function audio_resample(s,output,input,nb_samples::Integer) end function audio_resample_close(s) - ccall((:audio_resample_close,libavcodec),Void,(Ptr{ReSampleContext},),s) + ccall((:audio_resample_close,libavcodec),Cvoid,(Ptr{ReSampleContext},),s) end function av_resample_init(out_rate::Integer,in_rate::Integer,filter_length::Integer,log2_phase_count::Integer,linear::Integer,cutoff::Cdouble) @@ -486,11 +486,11 @@ function av_resample(c,dst,src,consumed,src_size::Integer,dst_size::Integer,upda end function av_resample_compensate(c,sample_delta::Integer,compensation_distance::Integer) - ccall((:av_resample_compensate,libavcodec),Void,(Ptr{AVResampleContext},Cint,Cint),c,sample_delta,compensation_distance) + ccall((:av_resample_compensate,libavcodec),Cvoid,(Ptr{AVResampleContext},Cint,Cint),c,sample_delta,compensation_distance) end function av_resample_close(c) - ccall((:av_resample_close,libavcodec),Void,(Ptr{AVResampleContext},),c) + ccall((:av_resample_close,libavcodec),Cvoid,(Ptr{AVResampleContext},),c) end function avpicture_alloc(picture,pix_fmt::AVPixelFormat,width::Integer,height::Integer) @@ -498,7 +498,7 @@ function avpicture_alloc(picture,pix_fmt::AVPixelFormat,width::Integer,height::I end function avpicture_free(picture) - ccall((:avpicture_free,libavcodec),Void,(Ptr{AVPicture},),picture) + ccall((:avpicture_free,libavcodec),Cvoid,(Ptr{AVPicture},),picture) end function avpicture_fill(picture,ptr,pix_fmt::AVPixelFormat,width::Integer,height::Integer) @@ -518,7 +518,7 @@ function avpicture_deinterlace(dst,src,pix_fmt::AVPixelFormat,width::Integer,hei end function av_picture_copy(dst,src,pix_fmt::AVPixelFormat,width::Integer,height::Integer) - ccall((:av_picture_copy,libavcodec),Void,(Ptr{AVPicture},Ptr{AVPicture},AVPixelFormat,Cint,Cint),dst,src,pix_fmt,width,height) + ccall((:av_picture_copy,libavcodec),Cvoid,(Ptr{AVPicture},Ptr{AVPicture},AVPixelFormat,Cint,Cint),dst,src,pix_fmt,width,height) end function av_picture_crop(dst,src,pix_fmt::AVPixelFormat,top_band::Integer,left_band::Integer) @@ -530,7 +530,7 @@ function av_picture_pad(dst,src,height::Integer,width::Integer,pix_fmt::AVPixelF end function avcodec_get_chroma_sub_sample(pix_fmt::AVPixelFormat,h_shift,v_shift) - ccall((:avcodec_get_chroma_sub_sample,libavcodec),Void,(AVPixelFormat,Ptr{Cint},Ptr{Cint}),pix_fmt,h_shift,v_shift) + ccall((:avcodec_get_chroma_sub_sample,libavcodec),Cvoid,(AVPixelFormat,Ptr{Cint},Ptr{Cint}),pix_fmt,h_shift,v_shift) end function avcodec_pix_fmt_to_codec_tag(pix_fmt::AVPixelFormat) @@ -558,7 +558,7 @@ function avcodec_default_get_format(s,fmt) end function avcodec_set_dimensions(s,width::Integer,height::Integer) - ccall((:avcodec_set_dimensions,libavcodec),Void,(Ptr{AVCodecContext},Cint,Cint),s,width,height) + ccall((:avcodec_set_dimensions,libavcodec),Cvoid,(Ptr{AVCodecContext},Cint,Cint),s,width,height) end function av_get_codec_tag_string(buf,buf_size::Csize_t,codec_tag::Integer) @@ -566,7 +566,7 @@ function av_get_codec_tag_string(buf,buf_size::Csize_t,codec_tag::Integer) end function avcodec_string(buf,buf_size::Integer,enc,encode::Integer) - ccall((:avcodec_string,libavcodec),Void,(Ptr{UInt8},Cint,Ptr{AVCodecContext},Cint),buf,buf_size,enc,encode) + ccall((:avcodec_string,libavcodec),Cvoid,(Ptr{UInt8},Cint,Ptr{AVCodecContext},Cint),buf,buf_size,enc,encode) end function av_get_profile_name(codec,profile::Integer) @@ -574,11 +574,11 @@ function av_get_profile_name(codec,profile::Integer) end function avcodec_default_execute(c,func,arg,ret,count::Integer,size::Integer) - ccall((:avcodec_default_execute,libavcodec),Cint,(Ptr{AVCodecContext},Ptr{Void},Ptr{Void},Ptr{Cint},Cint,Cint),c,func,arg,ret,count,size) + ccall((:avcodec_default_execute,libavcodec),Cint,(Ptr{AVCodecContext},Ptr{Cvoid},Ptr{Cvoid},Ptr{Cint},Cint,Cint),c,func,arg,ret,count,size) end function avcodec_default_execute2(c,func,arg,ret,count::Integer) - ccall((:avcodec_default_execute2,libavcodec),Cint,(Ptr{AVCodecContext},Ptr{Void},Ptr{Void},Ptr{Cint},Cint),c,func,arg,ret,count) + ccall((:avcodec_default_execute2,libavcodec),Cint,(Ptr{AVCodecContext},Ptr{Cvoid},Ptr{Cvoid},Ptr{Cint},Cint),c,func,arg,ret,count) end function avcodec_fill_audio_frame(frame,nb_channels::Integer,sample_fmt::AVSampleFormat,buf,buf_size::Integer,align::Integer) @@ -586,7 +586,7 @@ function avcodec_fill_audio_frame(frame,nb_channels::Integer,sample_fmt::AVSampl end function avcodec_flush_buffers(avctx) - ccall((:avcodec_flush_buffers,libavcodec),Void,(Ptr{AVCodecContext},),avctx) + ccall((:avcodec_flush_buffers,libavcodec),Cvoid,(Ptr{AVCodecContext},),avctx) end function av_get_bits_per_sample(codec_id::AVCodecID) @@ -606,7 +606,7 @@ function av_get_audio_frame_duration(avctx,frame_bytes::Integer) end function av_register_bitstream_filter(bsf) - ccall((:av_register_bitstream_filter,libavcodec),Void,(Ptr{AVBitStreamFilter},),bsf) + ccall((:av_register_bitstream_filter,libavcodec),Cvoid,(Ptr{AVBitStreamFilter},),bsf) end function av_bitstream_filter_init(name) @@ -618,7 +618,7 @@ function av_bitstream_filter_filter(bsfc,avctx,args,poutbuf,poutbuf_size,buf,buf end function av_bitstream_filter_close(bsf) - ccall((:av_bitstream_filter_close,libavcodec),Void,(Ptr{AVBitStreamFilterContext},),bsf) + ccall((:av_bitstream_filter_close,libavcodec),Cvoid,(Ptr{AVBitStreamFilterContext},),bsf) end function av_bitstream_filter_next(f) @@ -626,11 +626,11 @@ function av_bitstream_filter_next(f) end function av_fast_padded_malloc(ptr,size,min_size::Csize_t) - ccall((:av_fast_padded_malloc,libavcodec),Void,(Ptr{Void},Ptr{UInt32},Csize_t),ptr,size,min_size) + ccall((:av_fast_padded_malloc,libavcodec),Cvoid,(Ptr{Cvoid},Ptr{UInt32},Csize_t),ptr,size,min_size) end function av_fast_padded_mallocz(ptr,size,min_size::Csize_t) - ccall((:av_fast_padded_mallocz,libavcodec),Void,(Ptr{Void},Ptr{UInt32},Csize_t),ptr,size,min_size) + ccall((:av_fast_padded_mallocz,libavcodec),Cvoid,(Ptr{Cvoid},Ptr{UInt32},Csize_t),ptr,size,min_size) end function av_xiphlacing(s,v::Integer) @@ -638,11 +638,11 @@ function av_xiphlacing(s,v::Integer) end function av_log_missing_feature(avc,feature,want_sample::Integer) - ccall((:av_log_missing_feature,libavcodec),Void,(Ptr{Void},Ptr{UInt8},Cint),avc,feature,want_sample) + ccall((:av_log_missing_feature,libavcodec),Cvoid,(Ptr{Cvoid},Ptr{UInt8},Cint),avc,feature,want_sample) end function av_register_hwaccel(hwaccel) - ccall((:av_register_hwaccel,libavcodec),Void,(Ptr{AVHWAccel},),hwaccel) + ccall((:av_register_hwaccel,libavcodec),Cvoid,(Ptr{AVHWAccel},),hwaccel) end function av_hwaccel_next(hwaccel) @@ -650,7 +650,7 @@ function av_hwaccel_next(hwaccel) end function av_lockmgr_register(cb) - ccall((:av_lockmgr_register,libavcodec),Cint,(Ptr{Void},),cb) + ccall((:av_lockmgr_register,libavcodec),Cint,(Ptr{Cvoid},),cb) end function avcodec_get_type(codec_id::AVCodecID) diff --git a/src/ffmpeg/AVCodecs/v54/libavcodec_h.jl b/src/ffmpeg/AVCodecs/v54/libavcodec_h.jl index ffb26c92..544d7d19 100644 --- a/src/ffmpeg/AVCodecs/v54/libavcodec_h.jl +++ b/src/ffmpeg/AVCodecs/v54/libavcodec_h.jl @@ -2119,8 +2119,8 @@ struct AVPacket side_data::Ptr{AVPacketSideData} side_data_elems::Cint duration::Cint - destruct::Ptr{Void} - priv::Ptr{Void} + destruct::Ptr{Cvoid} + priv::Ptr{Cvoid} pos::Int64 convergence_duration::Int64 end @@ -2133,7 +2133,7 @@ const AV_SIDE_DATA_PARAM_CHANGE_SAMPLE_RATE = UInt32(4) const AV_SIDE_DATA_PARAM_CHANGE_DIMENSIONS = UInt32(8) # end enum AVSideDataParamChangeFlags -const AVCodecInternal = Void +const AVCodecInternal = Nothing # begin enum AVFieldOrder const AVFieldOrder = UInt32 @@ -2200,7 +2200,7 @@ struct AVProfile name::Ptr{UInt8} end -const AVCodecDefault = Void +const AVCodecDefault = Nothing struct AVCodec name::Ptr{UInt8} @@ -2218,16 +2218,16 @@ struct AVCodec profiles::Ptr{AVProfile} priv_data_size::Cint next::Ptr{AVCodec} - init_thread_copy::Ptr{Void} - update_thread_context::Ptr{Void} + init_thread_copy::Ptr{Cvoid} + update_thread_context::Ptr{Cvoid} defaults::Ptr{AVCodecDefault} - init_static_data::Ptr{Void} - init::Ptr{Void} - encode_sub::Ptr{Void} - encode2::Ptr{Void} - decode::Ptr{Void} - close::Ptr{Void} - flush::Ptr{Void} + init_static_data::Ptr{Cvoid} + init::Ptr{Cvoid} + encode_sub::Ptr{Cvoid} + encode2::Ptr{Cvoid} + decode::Ptr{Cvoid} + close::Ptr{Cvoid} + flush::Ptr{Cvoid} end struct AVHWAccel @@ -2237,14 +2237,14 @@ struct AVHWAccel pix_fmt::AVPixelFormat capabilities::Cint next::Ptr{AVHWAccel} - alloc_frame::Ptr{Void} - start_frame::Ptr{Void} - decode_slice::Ptr{Void} - end_frame::Ptr{Void} + alloc_frame::Ptr{Cvoid} + start_frame::Ptr{Cvoid} + decode_slice::Ptr{Cvoid} + end_frame::Ptr{Cvoid} frame_priv_data_size::Cint - decode_mb::Ptr{Void} - init::Ptr{Void} - uninit::Ptr{Void} + decode_mb::Ptr{Cvoid} + init::Ptr{Cvoid} + uninit::Ptr{Cvoid} priv_data_size::Cint end @@ -2259,9 +2259,9 @@ struct AVCodecContext codec_id::AVCodecID codec_tag::UInt32 stream_codec_tag::UInt32 - priv_data::Ptr{Void} + priv_data::Ptr{Cvoid} internal::Ptr{AVCodecInternal} - opaque::Ptr{Void} + opaque::Ptr{Cvoid} bit_rate::Cint bit_rate_tolerance::Cint global_quality::Cint @@ -2280,8 +2280,8 @@ struct AVCodecContext gop_size::Cint pix_fmt::AVPixelFormat me_method::Cint - draw_horiz_band::Ptr{Void} - get_format::Ptr{Void} + draw_horiz_band::Ptr{Cvoid} + get_format::Ptr{Cvoid} max_b_frames::Cint b_quant_factor::Cfloat rc_strategy::Cint @@ -2357,10 +2357,10 @@ struct AVCodecContext request_channel_layout::UInt64 audio_service_type::AVAudioServiceType request_sample_fmt::AVSampleFormat - get_buffer::Ptr{Void} - release_buffer::Ptr{Void} - reget_buffer::Ptr{Void} - get_buffer2::Ptr{Void} + get_buffer::Ptr{Cvoid} + release_buffer::Ptr{Cvoid} + reget_buffer::Ptr{Cvoid} + get_buffer2::Ptr{Cvoid} refcounted_frames::Cint qcompress::Cfloat qblur::Cfloat @@ -2393,7 +2393,7 @@ struct AVCodecContext min_prediction_order::Cint max_prediction_order::Cint timecode_frame_start::Int64 - rtp_callback::Ptr{Void} + rtp_callback::Ptr{Cvoid} rtp_payload_size::Cint mv_bits::Cint header_bits::Cint @@ -2414,7 +2414,7 @@ struct AVCodecContext err_recognition::Cint reordered_opaque::Int64 hwaccel::Ptr{AVHWAccel} - hwaccel_context::Ptr{Void} + hwaccel_context::Ptr{Cvoid} error::Array_8_Uint64 dct_algo::Cint idct_algo::Cint @@ -2426,9 +2426,9 @@ struct AVCodecContext thread_type::Cint active_thread_type::Cint thread_safe_callbacks::Cint - execute::Ptr{Void} - execute2::Ptr{Void} - thread_opaque::Ptr{Void} + execute::Ptr{Cvoid} + execute2::Ptr{Cvoid} + thread_opaque::Ptr{Cvoid} nsse_weight::Cint profile::Cint level::Cint @@ -2515,7 +2515,7 @@ struct AVSubtitle pts::Int64 end -const MpegEncContext = Void +const MpegEncContext = Nothing # begin enum AVPictureStructure const AVPictureStructure = UInt32 @@ -2547,15 +2547,15 @@ zero(::Type{Array_5_Cint}) = Array_5_Cint(fill(zero(Cint),5)...) struct AVCodecParser codec_ids::Array_5_Cint priv_data_size::Cint - parser_init::Ptr{Void} - parser_parse::Ptr{Void} - parser_close::Ptr{Void} - split::Ptr{Void} + parser_init::Ptr{Cvoid} + parser_parse::Ptr{Cvoid} + parser_close::Ptr{Cvoid} + split::Ptr{Cvoid} next::Ptr{AVCodecParser} end struct AVCodecParserContext - priv_data::Ptr{Void} + priv_data::Ptr{Cvoid} parser::Ptr{AVCodecParser} frame_offset::Int64 cur_offset::Int64 @@ -2588,19 +2588,19 @@ struct AVCodecParserContext output_picture_number::Cint end -const ReSampleContext = Void -const AVResampleContext = Void +const ReSampleContext = Nothing +const AVResampleContext = Nothing struct AVBitStreamFilter name::Ptr{UInt8} priv_data_size::Cint - filter::Ptr{Void} - close::Ptr{Void} + filter::Ptr{Cvoid} + close::Ptr{Cvoid} next::Ptr{AVBitStreamFilter} end struct AVBitStreamFilterContext - priv_data::Ptr{Void} + priv_data::Ptr{Cvoid} filter::Ptr{AVBitStreamFilter} parser::Ptr{AVCodecParserContext} next::Ptr{AVBitStreamFilterContext} @@ -2648,7 +2648,7 @@ struct AVDVProfile audio_stride::Cint audio_min_samples::Array_3_Cint audio_samples_dist::Array_5_Cint - audio_shuffle::Ptr{Void} + audio_shuffle::Ptr{Cvoid} end # immutable vaapi_context diff --git a/src/ffmpeg/AVCodecs/v54/vdpau.jl b/src/ffmpeg/AVCodecs/v54/vdpau.jl index 25f66e87..0566cd0c 100644 --- a/src/ffmpeg/AVCodecs/v54/vdpau.jl +++ b/src/ffmpeg/AVCodecs/v54/vdpau.jl @@ -19,7 +19,7 @@ function av_vdpau_hwaccel_get_render2(arg1) end function av_vdpau_hwaccel_set_render2(arg1,arg2::AVVDPAU_Render2) - ccall((:av_vdpau_hwaccel_set_render2,libavcodec),Void,(Ptr{AVVDPAUContext},AVVDPAU_Render2),arg1,arg2) + ccall((:av_vdpau_hwaccel_set_render2,libavcodec),Cvoid,(Ptr{AVVDPAUContext},AVVDPAU_Render2),arg1,arg2) end function av_vdpau_alloc_context() diff --git a/src/ffmpeg/AVCodecs/v55/avcodec.jl b/src/ffmpeg/AVCodecs/v55/avcodec.jl index 10883805..dd556593 100644 --- a/src/ffmpeg/AVCodecs/v55/avcodec.jl +++ b/src/ffmpeg/AVCodecs/v55/avcodec.jl @@ -146,7 +146,7 @@ function av_codec_get_pkt_timebase(avctx) end function av_codec_set_pkt_timebase(avctx,val::AVRational) - ccall((:av_codec_set_pkt_timebase,libavcodec),Void,(Ptr{AVCodecContext},AVRational),avctx,val) + ccall((:av_codec_set_pkt_timebase,libavcodec),Cvoid,(Ptr{AVCodecContext},AVRational),avctx,val) end function av_codec_get_codec_descriptor(avctx) @@ -154,7 +154,7 @@ function av_codec_get_codec_descriptor(avctx) end function av_codec_set_codec_descriptor(avctx,desc) - ccall((:av_codec_set_codec_descriptor,libavcodec),Void,(Ptr{AVCodecContext},Ptr{AVCodecDescriptor}),avctx,desc) + ccall((:av_codec_set_codec_descriptor,libavcodec),Cvoid,(Ptr{AVCodecContext},Ptr{AVCodecDescriptor}),avctx,desc) end function av_codec_get_lowres(avctx) @@ -162,7 +162,7 @@ function av_codec_get_lowres(avctx) end function av_codec_set_lowres(avctx,val::Integer) - ccall((:av_codec_set_lowres,libavcodec),Void,(Ptr{AVCodecContext},Cint),avctx,val) + ccall((:av_codec_set_lowres,libavcodec),Cvoid,(Ptr{AVCodecContext},Cint),avctx,val) end function av_codec_get_seek_preroll(avctx) @@ -170,7 +170,7 @@ function av_codec_get_seek_preroll(avctx) end function av_codec_set_seek_preroll(avctx,val::Integer) - ccall((:av_codec_set_seek_preroll,libavcodec),Void,(Ptr{AVCodecContext},Cint),avctx,val) + ccall((:av_codec_set_seek_preroll,libavcodec),Cvoid,(Ptr{AVCodecContext},Cint),avctx,val) end function av_codec_get_chroma_intra_matrix(avctx) @@ -178,7 +178,7 @@ function av_codec_get_chroma_intra_matrix(avctx) end function av_codec_set_chroma_intra_matrix(avctx,val) - ccall((:av_codec_set_chroma_intra_matrix,libavcodec),Void,(Ptr{AVCodecContext},Ptr{UInt16}),avctx,val) + ccall((:av_codec_set_chroma_intra_matrix,libavcodec),Cvoid,(Ptr{AVCodecContext},Ptr{UInt16}),avctx,val) end function av_codec_get_max_lowres(codec) @@ -202,11 +202,11 @@ function avcodec_license() end function avcodec_register(codec) - ccall((:avcodec_register,libavcodec),Void,(Ptr{AVCodec},),codec) + ccall((:avcodec_register,libavcodec),Cvoid,(Ptr{AVCodec},),codec) end function avcodec_register_all() - ccall((:avcodec_register_all,libavcodec),Void,()) + ccall((:avcodec_register_all,libavcodec),Cvoid,()) end function avcodec_alloc_context3(codec) @@ -214,7 +214,7 @@ function avcodec_alloc_context3(codec) end function avcodec_free_context(avctx) - ccall((:avcodec_free_context,libavcodec),Void,(Ptr{Ptr{AVCodecContext}},),avctx) + ccall((:avcodec_free_context,libavcodec),Cvoid,(Ptr{Ptr{AVCodecContext}},),avctx) end function avcodec_get_context_defaults3(s,codec) @@ -242,11 +242,11 @@ function avcodec_alloc_frame() end function avcodec_get_frame_defaults(frame) - ccall((:avcodec_get_frame_defaults,libavcodec),Void,(Ptr{AVFrame},),frame) + ccall((:avcodec_get_frame_defaults,libavcodec),Cvoid,(Ptr{AVFrame},),frame) end function avcodec_free_frame(frame) - ccall((:avcodec_free_frame,libavcodec),Void,(Ptr{Ptr{AVFrame}},),frame) + ccall((:avcodec_free_frame,libavcodec),Cvoid,(Ptr{Ptr{AVFrame}},),frame) end function avcodec_open2(avctx,codec,options) @@ -258,15 +258,15 @@ function avcodec_close(avctx) end function avsubtitle_free(sub) - ccall((:avsubtitle_free,libavcodec),Void,(Ptr{AVSubtitle},),sub) + ccall((:avsubtitle_free,libavcodec),Cvoid,(Ptr{AVSubtitle},),sub) end function av_destruct_packet(pkt) - ccall((:av_destruct_packet,libavcodec),Void,(Ptr{AVPacket},),pkt) + ccall((:av_destruct_packet,libavcodec),Cvoid,(Ptr{AVPacket},),pkt) end function av_init_packet(pkt) - ccall((:av_init_packet,libavcodec),Void,(Ptr{AVPacket},),pkt) + ccall((:av_init_packet,libavcodec),Cvoid,(Ptr{AVPacket},),pkt) end function av_new_packet(pkt,size::Integer) @@ -274,7 +274,7 @@ function av_new_packet(pkt,size::Integer) end function av_shrink_packet(pkt,size::Integer) - ccall((:av_shrink_packet,libavcodec),Void,(Ptr{AVPacket},Cint),pkt,size) + ccall((:av_shrink_packet,libavcodec),Cvoid,(Ptr{AVPacket},Cint),pkt,size) end function av_grow_packet(pkt,grow_by::Integer) @@ -298,7 +298,7 @@ function av_copy_packet_side_data(dst,src) end function av_free_packet(pkt) - ccall((:av_free_packet,libavcodec),Void,(Ptr{AVPacket},),pkt) + ccall((:av_free_packet,libavcodec),Cvoid,(Ptr{AVPacket},),pkt) end function av_packet_new_side_data(pkt,_type::AVPacketSideDataType,size::Integer) @@ -330,7 +330,7 @@ function av_packet_unpack_dictionary(data,size::Integer,dict) end function av_packet_free_side_data(pkt) - ccall((:av_packet_free_side_data,libavcodec),Void,(Ptr{AVPacket},),pkt) + ccall((:av_packet_free_side_data,libavcodec),Cvoid,(Ptr{AVPacket},),pkt) end function av_packet_ref(dst,src) @@ -338,11 +338,11 @@ function av_packet_ref(dst,src) end function av_packet_unref(pkt) - ccall((:av_packet_unref,libavcodec),Void,(Ptr{AVPacket},),pkt) + ccall((:av_packet_unref,libavcodec),Cvoid,(Ptr{AVPacket},),pkt) end function av_packet_move_ref(dst,src) - ccall((:av_packet_move_ref,libavcodec),Void,(Ptr{AVPacket},Ptr{AVPacket}),dst,src) + ccall((:av_packet_move_ref,libavcodec),Cvoid,(Ptr{AVPacket},Ptr{AVPacket}),dst,src) end function av_packet_copy_props(dst,src) @@ -350,7 +350,7 @@ function av_packet_copy_props(dst,src) end function av_packet_rescale_ts(pkt,tb_src::AVRational,tb_dst::AVRational) - ccall((:av_packet_rescale_ts,libavcodec),Void,(Ptr{AVPacket},AVRational,AVRational),pkt,tb_src,tb_dst) + ccall((:av_packet_rescale_ts,libavcodec),Cvoid,(Ptr{AVPacket},AVRational,AVRational),pkt,tb_src,tb_dst) end function avcodec_find_decoder(id::AVCodecID) @@ -366,7 +366,7 @@ function avcodec_default_get_buffer(s,pic) end function avcodec_default_release_buffer(s,pic) - ccall((:avcodec_default_release_buffer,libavcodec),Void,(Ptr{AVCodecContext},Ptr{AVFrame}),s,pic) + ccall((:avcodec_default_release_buffer,libavcodec),Cvoid,(Ptr{AVCodecContext},Ptr{AVFrame}),s,pic) end function avcodec_default_reget_buffer(s,pic) @@ -382,11 +382,11 @@ function avcodec_get_edge_width() end function avcodec_align_dimensions(s,width,height) - ccall((:avcodec_align_dimensions,libavcodec),Void,(Ptr{AVCodecContext},Ptr{Cint},Ptr{Cint}),s,width,height) + ccall((:avcodec_align_dimensions,libavcodec),Cvoid,(Ptr{AVCodecContext},Ptr{Cint},Ptr{Cint}),s,width,height) end function avcodec_align_dimensions2(s,width,height,linesize_align) - ccall((:avcodec_align_dimensions2,libavcodec),Void,(Ptr{AVCodecContext},Ptr{Cint},Ptr{Cint},Ptr{Cint}),s,width,height,linesize_align) + ccall((:avcodec_align_dimensions2,libavcodec),Cvoid,(Ptr{AVCodecContext},Ptr{Cint},Ptr{Cint},Ptr{Cint}),s,width,height,linesize_align) end function avcodec_enum_to_chroma_pos(xpos,ypos,pos::AVChromaLocation) @@ -418,7 +418,7 @@ function av_parser_next(c) end function av_register_codec_parser(parser) - ccall((:av_register_codec_parser,libavcodec),Void,(Ptr{AVCodecParser},),parser) + ccall((:av_register_codec_parser,libavcodec),Cvoid,(Ptr{AVCodecParser},),parser) end function av_parser_init(codec_id::Integer) @@ -434,7 +434,7 @@ function av_parser_change(s,avctx,poutbuf,poutbuf_size,buf,buf_size::Integer,key end function av_parser_close(s) - ccall((:av_parser_close,libavcodec),Void,(Ptr{AVCodecParserContext},),s) + ccall((:av_parser_close,libavcodec),Cvoid,(Ptr{AVCodecParserContext},),s) end function avcodec_find_encoder(id::AVCodecID) @@ -474,7 +474,7 @@ function audio_resample(s,output,input,nb_samples::Integer) end function audio_resample_close(s) - ccall((:audio_resample_close,libavcodec),Void,(Ptr{ReSampleContext},),s) + ccall((:audio_resample_close,libavcodec),Cvoid,(Ptr{ReSampleContext},),s) end function av_resample_init(out_rate::Integer,in_rate::Integer,filter_length::Integer,log2_phase_count::Integer,linear::Integer,cutoff::Cdouble) @@ -486,11 +486,11 @@ function av_resample(c,dst,src,consumed,src_size::Integer,dst_size::Integer,upda end function av_resample_compensate(c,sample_delta::Integer,compensation_distance::Integer) - ccall((:av_resample_compensate,libavcodec),Void,(Ptr{AVResampleContext},Cint,Cint),c,sample_delta,compensation_distance) + ccall((:av_resample_compensate,libavcodec),Cvoid,(Ptr{AVResampleContext},Cint,Cint),c,sample_delta,compensation_distance) end function av_resample_close(c) - ccall((:av_resample_close,libavcodec),Void,(Ptr{AVResampleContext},),c) + ccall((:av_resample_close,libavcodec),Cvoid,(Ptr{AVResampleContext},),c) end function avpicture_alloc(picture,pix_fmt::AVPixelFormat,width::Integer,height::Integer) @@ -498,7 +498,7 @@ function avpicture_alloc(picture,pix_fmt::AVPixelFormat,width::Integer,height::I end function avpicture_free(picture) - ccall((:avpicture_free,libavcodec),Void,(Ptr{AVPicture},),picture) + ccall((:avpicture_free,libavcodec),Cvoid,(Ptr{AVPicture},),picture) end function avpicture_fill(picture,ptr,pix_fmt::AVPixelFormat,width::Integer,height::Integer) @@ -518,7 +518,7 @@ function avpicture_deinterlace(dst,src,pix_fmt::AVPixelFormat,width::Integer,hei end function av_picture_copy(dst,src,pix_fmt::AVPixelFormat,width::Integer,height::Integer) - ccall((:av_picture_copy,libavcodec),Void,(Ptr{AVPicture},Ptr{AVPicture},AVPixelFormat,Cint,Cint),dst,src,pix_fmt,width,height) + ccall((:av_picture_copy,libavcodec),Cvoid,(Ptr{AVPicture},Ptr{AVPicture},AVPixelFormat,Cint,Cint),dst,src,pix_fmt,width,height) end function av_picture_crop(dst,src,pix_fmt::AVPixelFormat,top_band::Integer,left_band::Integer) @@ -530,7 +530,7 @@ function av_picture_pad(dst,src,height::Integer,width::Integer,pix_fmt::AVPixelF end function avcodec_get_chroma_sub_sample(pix_fmt::AVPixelFormat,h_shift,v_shift) - ccall((:avcodec_get_chroma_sub_sample,libavcodec),Void,(AVPixelFormat,Ptr{Cint},Ptr{Cint}),pix_fmt,h_shift,v_shift) + ccall((:avcodec_get_chroma_sub_sample,libavcodec),Cvoid,(AVPixelFormat,Ptr{Cint},Ptr{Cint}),pix_fmt,h_shift,v_shift) end function avcodec_pix_fmt_to_codec_tag(pix_fmt::AVPixelFormat) @@ -558,7 +558,7 @@ function avcodec_default_get_format(s,fmt) end function avcodec_set_dimensions(s,width::Integer,height::Integer) - ccall((:avcodec_set_dimensions,libavcodec),Void,(Ptr{AVCodecContext},Cint,Cint),s,width,height) + ccall((:avcodec_set_dimensions,libavcodec),Cvoid,(Ptr{AVCodecContext},Cint,Cint),s,width,height) end function av_get_codec_tag_string(buf,buf_size::Csize_t,codec_tag::Integer) @@ -566,7 +566,7 @@ function av_get_codec_tag_string(buf,buf_size::Csize_t,codec_tag::Integer) end function avcodec_string(buf,buf_size::Integer,enc,encode::Integer) - ccall((:avcodec_string,libavcodec),Void,(Ptr{UInt8},Cint,Ptr{AVCodecContext},Cint),buf,buf_size,enc,encode) + ccall((:avcodec_string,libavcodec),Cvoid,(Ptr{UInt8},Cint,Ptr{AVCodecContext},Cint),buf,buf_size,enc,encode) end function av_get_profile_name(codec,profile::Integer) @@ -574,11 +574,11 @@ function av_get_profile_name(codec,profile::Integer) end function avcodec_default_execute(c,func,arg,ret,count::Integer,size::Integer) - ccall((:avcodec_default_execute,libavcodec),Cint,(Ptr{AVCodecContext},Ptr{Void},Ptr{Void},Ptr{Cint},Cint,Cint),c,func,arg,ret,count,size) + ccall((:avcodec_default_execute,libavcodec),Cint,(Ptr{AVCodecContext},Ptr{Cvoid},Ptr{Cvoid},Ptr{Cint},Cint,Cint),c,func,arg,ret,count,size) end function avcodec_default_execute2(c,func,arg,ret,count::Integer) - ccall((:avcodec_default_execute2,libavcodec),Cint,(Ptr{AVCodecContext},Ptr{Void},Ptr{Void},Ptr{Cint},Cint),c,func,arg,ret,count) + ccall((:avcodec_default_execute2,libavcodec),Cint,(Ptr{AVCodecContext},Ptr{Cvoid},Ptr{Cvoid},Ptr{Cint},Cint),c,func,arg,ret,count) end function avcodec_fill_audio_frame(frame,nb_channels::Integer,sample_fmt::AVSampleFormat,buf,buf_size::Integer,align::Integer) @@ -586,7 +586,7 @@ function avcodec_fill_audio_frame(frame,nb_channels::Integer,sample_fmt::AVSampl end function avcodec_flush_buffers(avctx) - ccall((:avcodec_flush_buffers,libavcodec),Void,(Ptr{AVCodecContext},),avctx) + ccall((:avcodec_flush_buffers,libavcodec),Cvoid,(Ptr{AVCodecContext},),avctx) end function av_get_bits_per_sample(codec_id::AVCodecID) @@ -606,7 +606,7 @@ function av_get_audio_frame_duration(avctx,frame_bytes::Integer) end function av_register_bitstream_filter(bsf) - ccall((:av_register_bitstream_filter,libavcodec),Void,(Ptr{AVBitStreamFilter},),bsf) + ccall((:av_register_bitstream_filter,libavcodec),Cvoid,(Ptr{AVBitStreamFilter},),bsf) end function av_bitstream_filter_init(name) @@ -618,7 +618,7 @@ function av_bitstream_filter_filter(bsfc,avctx,args,poutbuf,poutbuf_size,buf,buf end function av_bitstream_filter_close(bsf) - ccall((:av_bitstream_filter_close,libavcodec),Void,(Ptr{AVBitStreamFilterContext},),bsf) + ccall((:av_bitstream_filter_close,libavcodec),Cvoid,(Ptr{AVBitStreamFilterContext},),bsf) end function av_bitstream_filter_next(f) @@ -626,11 +626,11 @@ function av_bitstream_filter_next(f) end function av_fast_padded_malloc(ptr,size,min_size::Csize_t) - ccall((:av_fast_padded_malloc,libavcodec),Void,(Ptr{Void},Ptr{UInt32},Csize_t),ptr,size,min_size) + ccall((:av_fast_padded_malloc,libavcodec),Cvoid,(Ptr{Cvoid},Ptr{UInt32},Csize_t),ptr,size,min_size) end function av_fast_padded_mallocz(ptr,size,min_size::Csize_t) - ccall((:av_fast_padded_mallocz,libavcodec),Void,(Ptr{Void},Ptr{UInt32},Csize_t),ptr,size,min_size) + ccall((:av_fast_padded_mallocz,libavcodec),Cvoid,(Ptr{Cvoid},Ptr{UInt32},Csize_t),ptr,size,min_size) end function av_xiphlacing(s,v::Integer) @@ -638,11 +638,11 @@ function av_xiphlacing(s,v::Integer) end function av_log_missing_feature(avc,feature,want_sample::Integer) - ccall((:av_log_missing_feature,libavcodec),Void,(Ptr{Void},Ptr{UInt8},Cint),avc,feature,want_sample) + ccall((:av_log_missing_feature,libavcodec),Cvoid,(Ptr{Cvoid},Ptr{UInt8},Cint),avc,feature,want_sample) end function av_register_hwaccel(hwaccel) - ccall((:av_register_hwaccel,libavcodec),Void,(Ptr{AVHWAccel},),hwaccel) + ccall((:av_register_hwaccel,libavcodec),Cvoid,(Ptr{AVHWAccel},),hwaccel) end function av_hwaccel_next(hwaccel) @@ -650,7 +650,7 @@ function av_hwaccel_next(hwaccel) end function av_lockmgr_register(cb) - ccall((:av_lockmgr_register,libavcodec),Cint,(Ptr{Void},),cb) + ccall((:av_lockmgr_register,libavcodec),Cint,(Ptr{Cvoid},),cb) end function avcodec_get_type(codec_id::AVCodecID) diff --git a/src/ffmpeg/AVCodecs/v55/libavcodec_h.jl b/src/ffmpeg/AVCodecs/v55/libavcodec_h.jl index ffb26c92..544d7d19 100644 --- a/src/ffmpeg/AVCodecs/v55/libavcodec_h.jl +++ b/src/ffmpeg/AVCodecs/v55/libavcodec_h.jl @@ -2119,8 +2119,8 @@ struct AVPacket side_data::Ptr{AVPacketSideData} side_data_elems::Cint duration::Cint - destruct::Ptr{Void} - priv::Ptr{Void} + destruct::Ptr{Cvoid} + priv::Ptr{Cvoid} pos::Int64 convergence_duration::Int64 end @@ -2133,7 +2133,7 @@ const AV_SIDE_DATA_PARAM_CHANGE_SAMPLE_RATE = UInt32(4) const AV_SIDE_DATA_PARAM_CHANGE_DIMENSIONS = UInt32(8) # end enum AVSideDataParamChangeFlags -const AVCodecInternal = Void +const AVCodecInternal = Nothing # begin enum AVFieldOrder const AVFieldOrder = UInt32 @@ -2200,7 +2200,7 @@ struct AVProfile name::Ptr{UInt8} end -const AVCodecDefault = Void +const AVCodecDefault = Nothing struct AVCodec name::Ptr{UInt8} @@ -2218,16 +2218,16 @@ struct AVCodec profiles::Ptr{AVProfile} priv_data_size::Cint next::Ptr{AVCodec} - init_thread_copy::Ptr{Void} - update_thread_context::Ptr{Void} + init_thread_copy::Ptr{Cvoid} + update_thread_context::Ptr{Cvoid} defaults::Ptr{AVCodecDefault} - init_static_data::Ptr{Void} - init::Ptr{Void} - encode_sub::Ptr{Void} - encode2::Ptr{Void} - decode::Ptr{Void} - close::Ptr{Void} - flush::Ptr{Void} + init_static_data::Ptr{Cvoid} + init::Ptr{Cvoid} + encode_sub::Ptr{Cvoid} + encode2::Ptr{Cvoid} + decode::Ptr{Cvoid} + close::Ptr{Cvoid} + flush::Ptr{Cvoid} end struct AVHWAccel @@ -2237,14 +2237,14 @@ struct AVHWAccel pix_fmt::AVPixelFormat capabilities::Cint next::Ptr{AVHWAccel} - alloc_frame::Ptr{Void} - start_frame::Ptr{Void} - decode_slice::Ptr{Void} - end_frame::Ptr{Void} + alloc_frame::Ptr{Cvoid} + start_frame::Ptr{Cvoid} + decode_slice::Ptr{Cvoid} + end_frame::Ptr{Cvoid} frame_priv_data_size::Cint - decode_mb::Ptr{Void} - init::Ptr{Void} - uninit::Ptr{Void} + decode_mb::Ptr{Cvoid} + init::Ptr{Cvoid} + uninit::Ptr{Cvoid} priv_data_size::Cint end @@ -2259,9 +2259,9 @@ struct AVCodecContext codec_id::AVCodecID codec_tag::UInt32 stream_codec_tag::UInt32 - priv_data::Ptr{Void} + priv_data::Ptr{Cvoid} internal::Ptr{AVCodecInternal} - opaque::Ptr{Void} + opaque::Ptr{Cvoid} bit_rate::Cint bit_rate_tolerance::Cint global_quality::Cint @@ -2280,8 +2280,8 @@ struct AVCodecContext gop_size::Cint pix_fmt::AVPixelFormat me_method::Cint - draw_horiz_band::Ptr{Void} - get_format::Ptr{Void} + draw_horiz_band::Ptr{Cvoid} + get_format::Ptr{Cvoid} max_b_frames::Cint b_quant_factor::Cfloat rc_strategy::Cint @@ -2357,10 +2357,10 @@ struct AVCodecContext request_channel_layout::UInt64 audio_service_type::AVAudioServiceType request_sample_fmt::AVSampleFormat - get_buffer::Ptr{Void} - release_buffer::Ptr{Void} - reget_buffer::Ptr{Void} - get_buffer2::Ptr{Void} + get_buffer::Ptr{Cvoid} + release_buffer::Ptr{Cvoid} + reget_buffer::Ptr{Cvoid} + get_buffer2::Ptr{Cvoid} refcounted_frames::Cint qcompress::Cfloat qblur::Cfloat @@ -2393,7 +2393,7 @@ struct AVCodecContext min_prediction_order::Cint max_prediction_order::Cint timecode_frame_start::Int64 - rtp_callback::Ptr{Void} + rtp_callback::Ptr{Cvoid} rtp_payload_size::Cint mv_bits::Cint header_bits::Cint @@ -2414,7 +2414,7 @@ struct AVCodecContext err_recognition::Cint reordered_opaque::Int64 hwaccel::Ptr{AVHWAccel} - hwaccel_context::Ptr{Void} + hwaccel_context::Ptr{Cvoid} error::Array_8_Uint64 dct_algo::Cint idct_algo::Cint @@ -2426,9 +2426,9 @@ struct AVCodecContext thread_type::Cint active_thread_type::Cint thread_safe_callbacks::Cint - execute::Ptr{Void} - execute2::Ptr{Void} - thread_opaque::Ptr{Void} + execute::Ptr{Cvoid} + execute2::Ptr{Cvoid} + thread_opaque::Ptr{Cvoid} nsse_weight::Cint profile::Cint level::Cint @@ -2515,7 +2515,7 @@ struct AVSubtitle pts::Int64 end -const MpegEncContext = Void +const MpegEncContext = Nothing # begin enum AVPictureStructure const AVPictureStructure = UInt32 @@ -2547,15 +2547,15 @@ zero(::Type{Array_5_Cint}) = Array_5_Cint(fill(zero(Cint),5)...) struct AVCodecParser codec_ids::Array_5_Cint priv_data_size::Cint - parser_init::Ptr{Void} - parser_parse::Ptr{Void} - parser_close::Ptr{Void} - split::Ptr{Void} + parser_init::Ptr{Cvoid} + parser_parse::Ptr{Cvoid} + parser_close::Ptr{Cvoid} + split::Ptr{Cvoid} next::Ptr{AVCodecParser} end struct AVCodecParserContext - priv_data::Ptr{Void} + priv_data::Ptr{Cvoid} parser::Ptr{AVCodecParser} frame_offset::Int64 cur_offset::Int64 @@ -2588,19 +2588,19 @@ struct AVCodecParserContext output_picture_number::Cint end -const ReSampleContext = Void -const AVResampleContext = Void +const ReSampleContext = Nothing +const AVResampleContext = Nothing struct AVBitStreamFilter name::Ptr{UInt8} priv_data_size::Cint - filter::Ptr{Void} - close::Ptr{Void} + filter::Ptr{Cvoid} + close::Ptr{Cvoid} next::Ptr{AVBitStreamFilter} end struct AVBitStreamFilterContext - priv_data::Ptr{Void} + priv_data::Ptr{Cvoid} filter::Ptr{AVBitStreamFilter} parser::Ptr{AVCodecParserContext} next::Ptr{AVBitStreamFilterContext} @@ -2648,7 +2648,7 @@ struct AVDVProfile audio_stride::Cint audio_min_samples::Array_3_Cint audio_samples_dist::Array_5_Cint - audio_shuffle::Ptr{Void} + audio_shuffle::Ptr{Cvoid} end # immutable vaapi_context diff --git a/src/ffmpeg/AVCodecs/v55/vdpau.jl b/src/ffmpeg/AVCodecs/v55/vdpau.jl index 25f66e87..0566cd0c 100644 --- a/src/ffmpeg/AVCodecs/v55/vdpau.jl +++ b/src/ffmpeg/AVCodecs/v55/vdpau.jl @@ -19,7 +19,7 @@ function av_vdpau_hwaccel_get_render2(arg1) end function av_vdpau_hwaccel_set_render2(arg1,arg2::AVVDPAU_Render2) - ccall((:av_vdpau_hwaccel_set_render2,libavcodec),Void,(Ptr{AVVDPAUContext},AVVDPAU_Render2),arg1,arg2) + ccall((:av_vdpau_hwaccel_set_render2,libavcodec),Cvoid,(Ptr{AVVDPAUContext},AVVDPAU_Render2),arg1,arg2) end function av_vdpau_alloc_context() diff --git a/src/ffmpeg/AVCodecs/v56/avcodec.jl b/src/ffmpeg/AVCodecs/v56/avcodec.jl index 87691762..6cb49bf1 100644 --- a/src/ffmpeg/AVCodecs/v56/avcodec.jl +++ b/src/ffmpeg/AVCodecs/v56/avcodec.jl @@ -146,7 +146,7 @@ function av_codec_get_pkt_timebase(avctx) end function av_codec_set_pkt_timebase(avctx,val::AVRational) - ccall((:av_codec_set_pkt_timebase,libavcodec),Void,(Ptr{AVCodecContext},AVRational),avctx,val) + ccall((:av_codec_set_pkt_timebase,libavcodec),Cvoid,(Ptr{AVCodecContext},AVRational),avctx,val) end function av_codec_get_codec_descriptor(avctx) @@ -154,7 +154,7 @@ function av_codec_get_codec_descriptor(avctx) end function av_codec_set_codec_descriptor(avctx,desc) - ccall((:av_codec_set_codec_descriptor,libavcodec),Void,(Ptr{AVCodecContext},Ptr{AVCodecDescriptor}),avctx,desc) + ccall((:av_codec_set_codec_descriptor,libavcodec),Cvoid,(Ptr{AVCodecContext},Ptr{AVCodecDescriptor}),avctx,desc) end function av_codec_get_lowres(avctx) @@ -162,7 +162,7 @@ function av_codec_get_lowres(avctx) end function av_codec_set_lowres(avctx,val::Integer) - ccall((:av_codec_set_lowres,libavcodec),Void,(Ptr{AVCodecContext},Cint),avctx,val) + ccall((:av_codec_set_lowres,libavcodec),Cvoid,(Ptr{AVCodecContext},Cint),avctx,val) end function av_codec_get_seek_preroll(avctx) @@ -170,7 +170,7 @@ function av_codec_get_seek_preroll(avctx) end function av_codec_set_seek_preroll(avctx,val::Integer) - ccall((:av_codec_set_seek_preroll,libavcodec),Void,(Ptr{AVCodecContext},Cint),avctx,val) + ccall((:av_codec_set_seek_preroll,libavcodec),Cvoid,(Ptr{AVCodecContext},Cint),avctx,val) end function av_codec_get_chroma_intra_matrix(avctx) @@ -178,7 +178,7 @@ function av_codec_get_chroma_intra_matrix(avctx) end function av_codec_set_chroma_intra_matrix(avctx,val) - ccall((:av_codec_set_chroma_intra_matrix,libavcodec),Void,(Ptr{AVCodecContext},Ptr{UInt16}),avctx,val) + ccall((:av_codec_set_chroma_intra_matrix,libavcodec),Cvoid,(Ptr{AVCodecContext},Ptr{UInt16}),avctx,val) end function av_codec_get_max_lowres(codec) @@ -202,11 +202,11 @@ function avcodec_license() end function avcodec_register(codec) - ccall((:avcodec_register,libavcodec),Void,(Ptr{AVCodec},),codec) + ccall((:avcodec_register,libavcodec),Cvoid,(Ptr{AVCodec},),codec) end function avcodec_register_all() - ccall((:avcodec_register_all,libavcodec),Void,()) + ccall((:avcodec_register_all,libavcodec),Cvoid,()) end function avcodec_alloc_context3(codec) @@ -214,7 +214,7 @@ function avcodec_alloc_context3(codec) end function avcodec_free_context(avctx) - ccall((:avcodec_free_context,libavcodec),Void,(Ptr{Ptr{AVCodecContext}},),avctx) + ccall((:avcodec_free_context,libavcodec),Cvoid,(Ptr{Ptr{AVCodecContext}},),avctx) end function avcodec_get_context_defaults3(s,codec) @@ -242,11 +242,11 @@ function avcodec_alloc_frame() end function avcodec_get_frame_defaults(frame) - ccall((:avcodec_get_frame_defaults,libavcodec),Void,(Ptr{AVFrame},),frame) + ccall((:avcodec_get_frame_defaults,libavcodec),Cvoid,(Ptr{AVFrame},),frame) end function avcodec_free_frame(frame) - ccall((:avcodec_free_frame,libavcodec),Void,(Ptr{Ptr{AVFrame}},),frame) + ccall((:avcodec_free_frame,libavcodec),Cvoid,(Ptr{Ptr{AVFrame}},),frame) end function avcodec_open2(avctx,codec,options) @@ -258,15 +258,15 @@ function avcodec_close(avctx) end function avsubtitle_free(sub) - ccall((:avsubtitle_free,libavcodec),Void,(Ptr{AVSubtitle},),sub) + ccall((:avsubtitle_free,libavcodec),Cvoid,(Ptr{AVSubtitle},),sub) end function av_destruct_packet(pkt) - ccall((:av_destruct_packet,libavcodec),Void,(Ptr{AVPacket},),pkt) + ccall((:av_destruct_packet,libavcodec),Cvoid,(Ptr{AVPacket},),pkt) end function av_init_packet(pkt) - ccall((:av_init_packet,libavcodec),Void,(Ptr{AVPacket},),pkt) + ccall((:av_init_packet,libavcodec),Cvoid,(Ptr{AVPacket},),pkt) end function av_new_packet(pkt,size::Integer) @@ -274,7 +274,7 @@ function av_new_packet(pkt,size::Integer) end function av_shrink_packet(pkt,size::Integer) - ccall((:av_shrink_packet,libavcodec),Void,(Ptr{AVPacket},Cint),pkt,size) + ccall((:av_shrink_packet,libavcodec),Cvoid,(Ptr{AVPacket},Cint),pkt,size) end function av_grow_packet(pkt,grow_by::Integer) @@ -298,7 +298,7 @@ function av_copy_packet_side_data(dst,src) end function av_free_packet(pkt) - ccall((:av_free_packet,libavcodec),Void,(Ptr{AVPacket},),pkt) + ccall((:av_free_packet,libavcodec),Cvoid,(Ptr{AVPacket},),pkt) end function av_packet_new_side_data(pkt,_type::AVPacketSideDataType,size::Integer) @@ -330,7 +330,7 @@ function av_packet_unpack_dictionary(data,size::Integer,dict) end function av_packet_free_side_data(pkt) - ccall((:av_packet_free_side_data,libavcodec),Void,(Ptr{AVPacket},),pkt) + ccall((:av_packet_free_side_data,libavcodec),Cvoid,(Ptr{AVPacket},),pkt) end function av_packet_ref(dst,src) @@ -338,11 +338,11 @@ function av_packet_ref(dst,src) end function av_packet_unref(pkt) - ccall((:av_packet_unref,libavcodec),Void,(Ptr{AVPacket},),pkt) + ccall((:av_packet_unref,libavcodec),Cvoid,(Ptr{AVPacket},),pkt) end function av_packet_move_ref(dst,src) - ccall((:av_packet_move_ref,libavcodec),Void,(Ptr{AVPacket},Ptr{AVPacket}),dst,src) + ccall((:av_packet_move_ref,libavcodec),Cvoid,(Ptr{AVPacket},Ptr{AVPacket}),dst,src) end function av_packet_copy_props(dst,src) @@ -350,7 +350,7 @@ function av_packet_copy_props(dst,src) end function av_packet_rescale_ts(pkt,tb_src::AVRational,tb_dst::AVRational) - ccall((:av_packet_rescale_ts,libavcodec),Void,(Ptr{AVPacket},AVRational,AVRational),pkt,tb_src,tb_dst) + ccall((:av_packet_rescale_ts,libavcodec),Cvoid,(Ptr{AVPacket},AVRational,AVRational),pkt,tb_src,tb_dst) end function avcodec_find_decoder(id::AVCodecID) @@ -366,7 +366,7 @@ function avcodec_default_get_buffer(s,pic) end function avcodec_default_release_buffer(s,pic) - ccall((:avcodec_default_release_buffer,libavcodec),Void,(Ptr{AVCodecContext},Ptr{AVFrame}),s,pic) + ccall((:avcodec_default_release_buffer,libavcodec),Cvoid,(Ptr{AVCodecContext},Ptr{AVFrame}),s,pic) end function avcodec_default_reget_buffer(s,pic) @@ -382,11 +382,11 @@ function avcodec_get_edge_width() end function avcodec_align_dimensions(s,width,height) - ccall((:avcodec_align_dimensions,libavcodec),Void,(Ptr{AVCodecContext},Ptr{Cint},Ptr{Cint}),s,width,height) + ccall((:avcodec_align_dimensions,libavcodec),Cvoid,(Ptr{AVCodecContext},Ptr{Cint},Ptr{Cint}),s,width,height) end function avcodec_align_dimensions2(s,width,height,linesize_align) - ccall((:avcodec_align_dimensions2,libavcodec),Void,(Ptr{AVCodecContext},Ptr{Cint},Ptr{Cint},Ptr{Cint}),s,width,height,linesize_align) + ccall((:avcodec_align_dimensions2,libavcodec),Cvoid,(Ptr{AVCodecContext},Ptr{Cint},Ptr{Cint},Ptr{Cint}),s,width,height,linesize_align) end function avcodec_enum_to_chroma_pos(xpos,ypos,pos::AVChromaLocation) @@ -418,7 +418,7 @@ function av_parser_next(c) end function av_register_codec_parser(parser) - ccall((:av_register_codec_parser,libavcodec),Void,(Ptr{AVCodecParser},),parser) + ccall((:av_register_codec_parser,libavcodec),Cvoid,(Ptr{AVCodecParser},),parser) end function av_parser_init(codec_id::Integer) @@ -434,7 +434,7 @@ function av_parser_change(s,avctx,poutbuf,poutbuf_size,buf,buf_size::Integer,key end function av_parser_close(s) - ccall((:av_parser_close,libavcodec),Void,(Ptr{AVCodecParserContext},),s) + ccall((:av_parser_close,libavcodec),Cvoid,(Ptr{AVCodecParserContext},),s) end function avcodec_find_encoder(id::AVCodecID) @@ -474,7 +474,7 @@ function audio_resample(s,output,input,nb_samples::Integer) end function audio_resample_close(s) - ccall((:audio_resample_close,libavcodec),Void,(Ptr{ReSampleContext},),s) + ccall((:audio_resample_close,libavcodec),Cvoid,(Ptr{ReSampleContext},),s) end function av_resample_init(out_rate::Integer,in_rate::Integer,filter_length::Integer,log2_phase_count::Integer,linear::Integer,cutoff::Cdouble) @@ -486,11 +486,11 @@ function av_resample(c,dst,src,consumed,src_size::Integer,dst_size::Integer,upda end function av_resample_compensate(c,sample_delta::Integer,compensation_distance::Integer) - ccall((:av_resample_compensate,libavcodec),Void,(Ptr{AVResampleContext},Cint,Cint),c,sample_delta,compensation_distance) + ccall((:av_resample_compensate,libavcodec),Cvoid,(Ptr{AVResampleContext},Cint,Cint),c,sample_delta,compensation_distance) end function av_resample_close(c) - ccall((:av_resample_close,libavcodec),Void,(Ptr{AVResampleContext},),c) + ccall((:av_resample_close,libavcodec),Cvoid,(Ptr{AVResampleContext},),c) end function avpicture_alloc(picture,pix_fmt::AVPixelFormat,width::Integer,height::Integer) @@ -498,7 +498,7 @@ function avpicture_alloc(picture,pix_fmt::AVPixelFormat,width::Integer,height::I end function avpicture_free(picture) - ccall((:avpicture_free,libavcodec),Void,(Ptr{AVPicture},),picture) + ccall((:avpicture_free,libavcodec),Cvoid,(Ptr{AVPicture},),picture) end function avpicture_fill(picture,ptr,pix_fmt::AVPixelFormat,width::Integer,height::Integer) @@ -518,7 +518,7 @@ function avpicture_deinterlace(dst,src,pix_fmt::AVPixelFormat,width::Integer,hei end function av_picture_copy(dst,src,pix_fmt::AVPixelFormat,width::Integer,height::Integer) - ccall((:av_picture_copy,libavcodec),Void,(Ptr{AVPicture},Ptr{AVPicture},AVPixelFormat,Cint,Cint),dst,src,pix_fmt,width,height) + ccall((:av_picture_copy,libavcodec),Cvoid,(Ptr{AVPicture},Ptr{AVPicture},AVPixelFormat,Cint,Cint),dst,src,pix_fmt,width,height) end function av_picture_crop(dst,src,pix_fmt::AVPixelFormat,top_band::Integer,left_band::Integer) @@ -530,7 +530,7 @@ function av_picture_pad(dst,src,height::Integer,width::Integer,pix_fmt::AVPixelF end function avcodec_get_chroma_sub_sample(pix_fmt::AVPixelFormat,h_shift,v_shift) - ccall((:avcodec_get_chroma_sub_sample,libavcodec),Void,(AVPixelFormat,Ptr{Cint},Ptr{Cint}),pix_fmt,h_shift,v_shift) + ccall((:avcodec_get_chroma_sub_sample,libavcodec),Cvoid,(AVPixelFormat,Ptr{Cint},Ptr{Cint}),pix_fmt,h_shift,v_shift) end function avcodec_pix_fmt_to_codec_tag(pix_fmt::AVPixelFormat) @@ -558,7 +558,7 @@ function avcodec_default_get_format(s,fmt) end function avcodec_set_dimensions(s,width::Integer,height::Integer) - ccall((:avcodec_set_dimensions,libavcodec),Void,(Ptr{AVCodecContext},Cint,Cint),s,width,height) + ccall((:avcodec_set_dimensions,libavcodec),Cvoid,(Ptr{AVCodecContext},Cint,Cint),s,width,height) end function av_get_codec_tag_string(buf,buf_size::Csize_t,codec_tag::Integer) @@ -566,7 +566,7 @@ function av_get_codec_tag_string(buf,buf_size::Csize_t,codec_tag::Integer) end function avcodec_string(buf,buf_size::Integer,enc,encode::Integer) - ccall((:avcodec_string,libavcodec),Void,(Ptr{UInt8},Cint,Ptr{AVCodecContext},Cint),buf,buf_size,enc,encode) + ccall((:avcodec_string,libavcodec),Cvoid,(Ptr{UInt8},Cint,Ptr{AVCodecContext},Cint),buf,buf_size,enc,encode) end function av_get_profile_name(codec,profile::Integer) @@ -574,11 +574,11 @@ function av_get_profile_name(codec,profile::Integer) end function avcodec_default_execute(c,func,arg,ret,count::Integer,size::Integer) - ccall((:avcodec_default_execute,libavcodec),Cint,(Ptr{AVCodecContext},Ptr{Void},Ptr{Void},Ptr{Cint},Cint,Cint),c,func,arg,ret,count,size) + ccall((:avcodec_default_execute,libavcodec),Cint,(Ptr{AVCodecContext},Ptr{Cvoid},Ptr{Cvoid},Ptr{Cint},Cint,Cint),c,func,arg,ret,count,size) end function avcodec_default_execute2(c,func,arg,ret,count::Integer) - ccall((:avcodec_default_execute2,libavcodec),Cint,(Ptr{AVCodecContext},Ptr{Void},Ptr{Void},Ptr{Cint},Cint),c,func,arg,ret,count) + ccall((:avcodec_default_execute2,libavcodec),Cint,(Ptr{AVCodecContext},Ptr{Cvoid},Ptr{Cvoid},Ptr{Cint},Cint),c,func,arg,ret,count) end function avcodec_fill_audio_frame(frame,nb_channels::Integer,sample_fmt::AVSampleFormat,buf,buf_size::Integer,align::Integer) @@ -586,7 +586,7 @@ function avcodec_fill_audio_frame(frame,nb_channels::Integer,sample_fmt::AVSampl end function avcodec_flush_buffers(avctx) - ccall((:avcodec_flush_buffers,libavcodec),Void,(Ptr{AVCodecContext},),avctx) + ccall((:avcodec_flush_buffers,libavcodec),Cvoid,(Ptr{AVCodecContext},),avctx) end function av_get_bits_per_sample(codec_id::AVCodecID) @@ -606,7 +606,7 @@ function av_get_audio_frame_duration(avctx,frame_bytes::Integer) end function av_register_bitstream_filter(bsf) - ccall((:av_register_bitstream_filter,libavcodec),Void,(Ptr{AVBitStreamFilter},),bsf) + ccall((:av_register_bitstream_filter,libavcodec),Cvoid,(Ptr{AVBitStreamFilter},),bsf) end function av_bitstream_filter_init(name) @@ -618,7 +618,7 @@ function av_bitstream_filter_filter(bsfc,avctx,args,poutbuf,poutbuf_size,buf,buf end function av_bitstream_filter_close(bsf) - ccall((:av_bitstream_filter_close,libavcodec),Void,(Ptr{AVBitStreamFilterContext},),bsf) + ccall((:av_bitstream_filter_close,libavcodec),Cvoid,(Ptr{AVBitStreamFilterContext},),bsf) end function av_bitstream_filter_next(f) @@ -626,11 +626,11 @@ function av_bitstream_filter_next(f) end function av_fast_padded_malloc(ptr,size,min_size::Csize_t) - ccall((:av_fast_padded_malloc,libavcodec),Void,(Ptr{Void},Ptr{UInt32},Csize_t),ptr,size,min_size) + ccall((:av_fast_padded_malloc,libavcodec),Cvoid,(Ptr{Cvoid},Ptr{UInt32},Csize_t),ptr,size,min_size) end function av_fast_padded_mallocz(ptr,size,min_size::Csize_t) - ccall((:av_fast_padded_mallocz,libavcodec),Void,(Ptr{Void},Ptr{UInt32},Csize_t),ptr,size,min_size) + ccall((:av_fast_padded_mallocz,libavcodec),Cvoid,(Ptr{Cvoid},Ptr{UInt32},Csize_t),ptr,size,min_size) end function av_xiphlacing(s,v::Integer) @@ -638,11 +638,11 @@ function av_xiphlacing(s,v::Integer) end function av_log_missing_feature(avc,feature,want_sample::Integer) - ccall((:av_log_missing_feature,libavcodec),Void,(Ptr{Void},Ptr{UInt8},Cint),avc,feature,want_sample) + ccall((:av_log_missing_feature,libavcodec),Cvoid,(Ptr{Cvoid},Ptr{UInt8},Cint),avc,feature,want_sample) end function av_register_hwaccel(hwaccel) - ccall((:av_register_hwaccel,libavcodec),Void,(Ptr{AVHWAccel},),hwaccel) + ccall((:av_register_hwaccel,libavcodec),Cvoid,(Ptr{AVHWAccel},),hwaccel) end function av_hwaccel_next(hwaccel) @@ -650,7 +650,7 @@ function av_hwaccel_next(hwaccel) end function av_lockmgr_register(cb) - ccall((:av_lockmgr_register,libavcodec),Cint,(Ptr{Void},),cb) + ccall((:av_lockmgr_register,libavcodec),Cint,(Ptr{Cvoid},),cb) end function avcodec_get_type(codec_id::AVCodecID) diff --git a/src/ffmpeg/AVCodecs/v56/libavcodec_h.jl b/src/ffmpeg/AVCodecs/v56/libavcodec_h.jl index bd30831f..b331b172 100644 --- a/src/ffmpeg/AVCodecs/v56/libavcodec_h.jl +++ b/src/ffmpeg/AVCodecs/v56/libavcodec_h.jl @@ -2128,8 +2128,8 @@ struct AVPacket side_data::Ptr{AVPacketSideData} side_data_elems::Cint duration::Cint - destruct::Ptr{Void} - priv::Ptr{Void} + destruct::Ptr{Cvoid} + priv::Ptr{Cvoid} pos::Int64 convergence_duration::Int64 end @@ -2142,7 +2142,7 @@ const AV_SIDE_DATA_PARAM_CHANGE_SAMPLE_RATE = UInt32(4) const AV_SIDE_DATA_PARAM_CHANGE_DIMENSIONS = UInt32(8) # end enum AVSideDataParamChangeFlags -const AVCodecInternal = Void +const AVCodecInternal = Nothing # begin enum AVFieldOrder const AVFieldOrder = UInt32 @@ -2209,7 +2209,7 @@ struct AVProfile name::Ptr{UInt8} end -const AVCodecDefault = Void +const AVCodecDefault = Nothing struct AVCodec name::Ptr{UInt8} @@ -2227,16 +2227,16 @@ struct AVCodec profiles::Ptr{AVProfile} priv_data_size::Cint next::Ptr{AVCodec} - init_thread_copy::Ptr{Void} - update_thread_context::Ptr{Void} + init_thread_copy::Ptr{Cvoid} + update_thread_context::Ptr{Cvoid} defaults::Ptr{AVCodecDefault} - init_static_data::Ptr{Void} - init::Ptr{Void} - encode_sub::Ptr{Void} - encode2::Ptr{Void} - decode::Ptr{Void} - close::Ptr{Void} - flush::Ptr{Void} + init_static_data::Ptr{Cvoid} + init::Ptr{Cvoid} + encode_sub::Ptr{Cvoid} + encode2::Ptr{Cvoid} + decode::Ptr{Cvoid} + close::Ptr{Cvoid} + flush::Ptr{Cvoid} end struct AVHWAccel @@ -2246,14 +2246,14 @@ struct AVHWAccel pix_fmt::AVPixelFormat capabilities::Cint next::Ptr{AVHWAccel} - alloc_frame::Ptr{Void} - start_frame::Ptr{Void} - decode_slice::Ptr{Void} - end_frame::Ptr{Void} + alloc_frame::Ptr{Cvoid} + start_frame::Ptr{Cvoid} + decode_slice::Ptr{Cvoid} + end_frame::Ptr{Cvoid} frame_priv_data_size::Cint - decode_mb::Ptr{Void} - init::Ptr{Void} - uninit::Ptr{Void} + decode_mb::Ptr{Cvoid} + init::Ptr{Cvoid} + uninit::Ptr{Cvoid} priv_data_size::Cint end @@ -2268,9 +2268,9 @@ struct AVCodecContext codec_id::AVCodecID codec_tag::UInt32 stream_codec_tag::UInt32 - priv_data::Ptr{Void} + priv_data::Ptr{Cvoid} internal::Ptr{AVCodecInternal} - opaque::Ptr{Void} + opaque::Ptr{Cvoid} bit_rate::Cint bit_rate_tolerance::Cint global_quality::Cint @@ -2289,8 +2289,8 @@ struct AVCodecContext gop_size::Cint pix_fmt::AVPixelFormat me_method::Cint - draw_horiz_band::Ptr{Void} - get_format::Ptr{Void} + draw_horiz_band::Ptr{Cvoid} + get_format::Ptr{Cvoid} max_b_frames::Cint b_quant_factor::Cfloat rc_strategy::Cint @@ -2366,10 +2366,10 @@ struct AVCodecContext request_channel_layout::UInt64 audio_service_type::AVAudioServiceType request_sample_fmt::AVSampleFormat - get_buffer::Ptr{Void} - release_buffer::Ptr{Void} - reget_buffer::Ptr{Void} - get_buffer2::Ptr{Void} + get_buffer::Ptr{Cvoid} + release_buffer::Ptr{Cvoid} + reget_buffer::Ptr{Cvoid} + get_buffer2::Ptr{Cvoid} refcounted_frames::Cint qcompress::Cfloat qblur::Cfloat @@ -2402,7 +2402,7 @@ struct AVCodecContext min_prediction_order::Cint max_prediction_order::Cint timecode_frame_start::Int64 - rtp_callback::Ptr{Void} + rtp_callback::Ptr{Cvoid} rtp_payload_size::Cint mv_bits::Cint header_bits::Cint @@ -2423,7 +2423,7 @@ struct AVCodecContext err_recognition::Cint reordered_opaque::Int64 hwaccel::Ptr{AVHWAccel} - hwaccel_context::Ptr{Void} + hwaccel_context::Ptr{Cvoid} error::Array_8_Uint64 dct_algo::Cint idct_algo::Cint @@ -2435,9 +2435,9 @@ struct AVCodecContext thread_type::Cint active_thread_type::Cint thread_safe_callbacks::Cint - execute::Ptr{Void} - execute2::Ptr{Void} - thread_opaque::Ptr{Void} + execute::Ptr{Cvoid} + execute2::Ptr{Cvoid} + thread_opaque::Ptr{Cvoid} nsse_weight::Cint profile::Cint level::Cint @@ -2526,7 +2526,7 @@ struct AVSubtitle pts::Int64 end -const MpegEncContext = Void +const MpegEncContext = Nothing # begin enum AVPictureStructure const AVPictureStructure = UInt32 @@ -2558,15 +2558,15 @@ zero(::Type{Array_5_Cint}) = Array_5_Cint(fill(zero(Cint),5)...) struct AVCodecParser codec_ids::Array_5_Cint priv_data_size::Cint - parser_init::Ptr{Void} - parser_parse::Ptr{Void} - parser_close::Ptr{Void} - split::Ptr{Void} + parser_init::Ptr{Cvoid} + parser_parse::Ptr{Cvoid} + parser_close::Ptr{Cvoid} + split::Ptr{Cvoid} next::Ptr{AVCodecParser} end struct AVCodecParserContext - priv_data::Ptr{Void} + priv_data::Ptr{Cvoid} parser::Ptr{AVCodecParser} frame_offset::Int64 cur_offset::Int64 @@ -2599,19 +2599,19 @@ struct AVCodecParserContext output_picture_number::Cint end -const ReSampleContext = Void -const AVResampleContext = Void +const ReSampleContext = Nothing +const AVResampleContext = Nothing struct AVBitStreamFilter name::Ptr{UInt8} priv_data_size::Cint - filter::Ptr{Void} - close::Ptr{Void} + filter::Ptr{Cvoid} + close::Ptr{Cvoid} next::Ptr{AVBitStreamFilter} end struct AVBitStreamFilterContext - priv_data::Ptr{Void} + priv_data::Ptr{Cvoid} filter::Ptr{AVBitStreamFilter} parser::Ptr{AVCodecParserContext} next::Ptr{AVBitStreamFilterContext} diff --git a/src/ffmpeg/AVCodecs/v56/vdpau.jl b/src/ffmpeg/AVCodecs/v56/vdpau.jl index 86a55f6a..6299ef1a 100644 --- a/src/ffmpeg/AVCodecs/v56/vdpau.jl +++ b/src/ffmpeg/AVCodecs/v56/vdpau.jl @@ -20,7 +20,7 @@ function av_vdpau_hwaccel_get_render2(arg1) end function av_vdpau_hwaccel_set_render2(arg1,arg2::AVVDPAU_Render2) - ccall((:av_vdpau_hwaccel_set_render2,libavcodec),Void,(Ptr{AVVDPAUContext},AVVDPAU_Render2),arg1,arg2) + ccall((:av_vdpau_hwaccel_set_render2,libavcodec),Cvoid,(Ptr{AVVDPAUContext},AVVDPAU_Render2),arg1,arg2) end function av_vdpau_bind_context(avctx,device::VdpDevice,get_proc_address,flags::Integer) diff --git a/src/ffmpeg/AVCodecs/v57/avcodec.jl b/src/ffmpeg/AVCodecs/v57/avcodec.jl index 2e253de8..3592fb15 100644 --- a/src/ffmpeg/AVCodecs/v57/avcodec.jl +++ b/src/ffmpeg/AVCodecs/v57/avcodec.jl @@ -143,7 +143,7 @@ function av_codec_get_pkt_timebase(avctx) end function av_codec_set_pkt_timebase(avctx,val::AVRational) - ccall((:av_codec_set_pkt_timebase,libavcodec),Void,(Ptr{AVCodecContext},AVRational),avctx,val) + ccall((:av_codec_set_pkt_timebase,libavcodec),Cvoid,(Ptr{AVCodecContext},AVRational),avctx,val) end function av_codec_get_codec_descriptor(avctx) @@ -151,7 +151,7 @@ function av_codec_get_codec_descriptor(avctx) end function av_codec_set_codec_descriptor(avctx,desc) - ccall((:av_codec_set_codec_descriptor,libavcodec),Void,(Ptr{AVCodecContext},Ptr{AVCodecDescriptor}),avctx,desc) + ccall((:av_codec_set_codec_descriptor,libavcodec),Cvoid,(Ptr{AVCodecContext},Ptr{AVCodecDescriptor}),avctx,desc) end function av_codec_get_codec_properties(avctx) @@ -163,7 +163,7 @@ function av_codec_get_lowres(avctx) end function av_codec_set_lowres(avctx,val::Integer) - ccall((:av_codec_set_lowres,libavcodec),Void,(Ptr{AVCodecContext},Cint),avctx,val) + ccall((:av_codec_set_lowres,libavcodec),Cvoid,(Ptr{AVCodecContext},Cint),avctx,val) end function av_codec_get_seek_preroll(avctx) @@ -171,7 +171,7 @@ function av_codec_get_seek_preroll(avctx) end function av_codec_set_seek_preroll(avctx,val::Integer) - ccall((:av_codec_set_seek_preroll,libavcodec),Void,(Ptr{AVCodecContext},Cint),avctx,val) + ccall((:av_codec_set_seek_preroll,libavcodec),Cvoid,(Ptr{AVCodecContext},Cint),avctx,val) end function av_codec_get_chroma_intra_matrix(avctx) @@ -179,7 +179,7 @@ function av_codec_get_chroma_intra_matrix(avctx) end function av_codec_set_chroma_intra_matrix(avctx,val) - ccall((:av_codec_set_chroma_intra_matrix,libavcodec),Void,(Ptr{AVCodecContext},Ptr{UInt16}),avctx,val) + ccall((:av_codec_set_chroma_intra_matrix,libavcodec),Cvoid,(Ptr{AVCodecContext},Ptr{UInt16}),avctx,val) end function av_codec_get_max_lowres(codec) @@ -203,11 +203,11 @@ function avcodec_license() end function avcodec_register(codec) - ccall((:avcodec_register,libavcodec),Void,(Ptr{AVCodec},),codec) + ccall((:avcodec_register,libavcodec),Cvoid,(Ptr{AVCodec},),codec) end function avcodec_register_all() - ccall((:avcodec_register_all,libavcodec),Void,()) + ccall((:avcodec_register_all,libavcodec),Cvoid,()) end function avcodec_alloc_context3(codec) @@ -215,7 +215,7 @@ function avcodec_alloc_context3(codec) end function avcodec_free_context(avctx) - ccall((:avcodec_free_context,libavcodec),Void,(Ptr{Ptr{AVCodecContext}},),avctx) + ccall((:avcodec_free_context,libavcodec),Cvoid,(Ptr{Ptr{AVCodecContext}},),avctx) end function avcodec_get_context_defaults3(s,codec) @@ -247,7 +247,7 @@ function avcodec_close(avctx) end function avsubtitle_free(sub) - ccall((:avsubtitle_free,libavcodec),Void,(Ptr{AVSubtitle},),sub) + ccall((:avsubtitle_free,libavcodec),Cvoid,(Ptr{AVSubtitle},),sub) end function av_packet_alloc() @@ -259,11 +259,11 @@ function av_packet_clone(src) end function av_packet_free(pkt) - ccall((:av_packet_free,libavcodec),Void,(Ptr{Ptr{AVPacket}},),pkt) + ccall((:av_packet_free,libavcodec),Cvoid,(Ptr{Ptr{AVPacket}},),pkt) end function av_init_packet(pkt) - ccall((:av_init_packet,libavcodec),Void,(Ptr{AVPacket},),pkt) + ccall((:av_init_packet,libavcodec),Cvoid,(Ptr{AVPacket},),pkt) end function av_new_packet(pkt,size::Integer) @@ -271,7 +271,7 @@ function av_new_packet(pkt,size::Integer) end function av_shrink_packet(pkt,size::Integer) - ccall((:av_shrink_packet,libavcodec),Void,(Ptr{AVPacket},Cint),pkt,size) + ccall((:av_shrink_packet,libavcodec),Cvoid,(Ptr{AVPacket},Cint),pkt,size) end function av_grow_packet(pkt,grow_by::Integer) @@ -295,7 +295,7 @@ function av_copy_packet_side_data(dst,src) end function av_free_packet(pkt) - ccall((:av_free_packet,libavcodec),Void,(Ptr{AVPacket},),pkt) + ccall((:av_free_packet,libavcodec),Cvoid,(Ptr{AVPacket},),pkt) end function av_packet_new_side_data(pkt,_type::AVPacketSideDataType,size::Integer) @@ -335,7 +335,7 @@ function av_packet_unpack_dictionary(data,size::Integer,dict) end function av_packet_free_side_data(pkt) - ccall((:av_packet_free_side_data,libavcodec),Void,(Ptr{AVPacket},),pkt) + ccall((:av_packet_free_side_data,libavcodec),Cvoid,(Ptr{AVPacket},),pkt) end function av_packet_ref(dst,src) @@ -343,11 +343,11 @@ function av_packet_ref(dst,src) end function av_packet_unref(pkt) - ccall((:av_packet_unref,libavcodec),Void,(Ptr{AVPacket},),pkt) + ccall((:av_packet_unref,libavcodec),Cvoid,(Ptr{AVPacket},),pkt) end function av_packet_move_ref(dst,src) - ccall((:av_packet_move_ref,libavcodec),Void,(Ptr{AVPacket},Ptr{AVPacket}),dst,src) + ccall((:av_packet_move_ref,libavcodec),Cvoid,(Ptr{AVPacket},Ptr{AVPacket}),dst,src) end function av_packet_copy_props(dst,src) @@ -355,7 +355,7 @@ function av_packet_copy_props(dst,src) end function av_packet_rescale_ts(pkt,tb_src::AVRational,tb_dst::AVRational) - ccall((:av_packet_rescale_ts,libavcodec),Void,(Ptr{AVPacket},AVRational,AVRational),pkt,tb_src,tb_dst) + ccall((:av_packet_rescale_ts,libavcodec),Cvoid,(Ptr{AVPacket},AVRational,AVRational),pkt,tb_src,tb_dst) end function avcodec_find_decoder(id::AVCodecID) @@ -375,11 +375,11 @@ function avcodec_get_edge_width() end function avcodec_align_dimensions(s,width,height) - ccall((:avcodec_align_dimensions,libavcodec),Void,(Ptr{AVCodecContext},Ptr{Cint},Ptr{Cint}),s,width,height) + ccall((:avcodec_align_dimensions,libavcodec),Cvoid,(Ptr{AVCodecContext},Ptr{Cint},Ptr{Cint}),s,width,height) end function avcodec_align_dimensions2(s,width,height,linesize_align::NTuple{8,Cint}) - ccall((:avcodec_align_dimensions2,libavcodec),Void,(Ptr{AVCodecContext},Ptr{Cint},Ptr{Cint},NTuple{8,Cint}),s,width,height,linesize_align) + ccall((:avcodec_align_dimensions2,libavcodec),Cvoid,(Ptr{AVCodecContext},Ptr{Cint},Ptr{Cint},NTuple{8,Cint}),s,width,height,linesize_align) end function avcodec_enum_to_chroma_pos(xpos,ypos,pos::AVChromaLocation) @@ -407,7 +407,7 @@ function av_parser_next(c) end function av_register_codec_parser(parser) - ccall((:av_register_codec_parser,libavcodec),Void,(Ptr{AVCodecParser},),parser) + ccall((:av_register_codec_parser,libavcodec),Cvoid,(Ptr{AVCodecParser},),parser) end function av_parser_init(codec_id::Integer) @@ -423,7 +423,7 @@ function av_parser_change(s,avctx,poutbuf,poutbuf_size,buf,buf_size::Integer,key end function av_parser_close(s) - ccall((:av_parser_close,libavcodec),Void,(Ptr{AVCodecParserContext},),s) + ccall((:av_parser_close,libavcodec),Cvoid,(Ptr{AVCodecParserContext},),s) end function avcodec_find_encoder(id::AVCodecID) @@ -455,7 +455,7 @@ function audio_resample(s,output,input,nb_samples::Integer) end function audio_resample_close(s) - ccall((:audio_resample_close,libavcodec),Void,(Ptr{ReSampleContext},),s) + ccall((:audio_resample_close,libavcodec),Cvoid,(Ptr{ReSampleContext},),s) end function av_resample_init(out_rate::Integer,in_rate::Integer,filter_length::Integer,log2_phase_count::Integer,linear::Integer,cutoff::Cdouble) @@ -467,11 +467,11 @@ function av_resample(c,dst,src,consumed,src_size::Integer,dst_size::Integer,upda end function av_resample_compensate(c,sample_delta::Integer,compensation_distance::Integer) - ccall((:av_resample_compensate,libavcodec),Void,(Ptr{AVResampleContext},Cint,Cint),c,sample_delta,compensation_distance) + ccall((:av_resample_compensate,libavcodec),Cvoid,(Ptr{AVResampleContext},Cint,Cint),c,sample_delta,compensation_distance) end function av_resample_close(c) - ccall((:av_resample_close,libavcodec),Void,(Ptr{AVResampleContext},),c) + ccall((:av_resample_close,libavcodec),Cvoid,(Ptr{AVResampleContext},),c) end function avpicture_alloc(picture,pix_fmt::AVPixelFormat,width::Integer,height::Integer) @@ -479,7 +479,7 @@ function avpicture_alloc(picture,pix_fmt::AVPixelFormat,width::Integer,height::I end function avpicture_free(picture) - ccall((:avpicture_free,libavcodec),Void,(Ptr{AVPicture},),picture) + ccall((:avpicture_free,libavcodec),Cvoid,(Ptr{AVPicture},),picture) end function avpicture_fill(picture,ptr,pix_fmt::AVPixelFormat,width::Integer,height::Integer) @@ -495,7 +495,7 @@ function avpicture_get_size(pix_fmt::AVPixelFormat,width::Integer,height::Intege end function av_picture_copy(dst,src,pix_fmt::AVPixelFormat,width::Integer,height::Integer) - ccall((:av_picture_copy,libavcodec),Void,(Ptr{AVPicture},Ptr{AVPicture},AVPixelFormat,Cint,Cint),dst,src,pix_fmt,width,height) + ccall((:av_picture_copy,libavcodec),Cvoid,(Ptr{AVPicture},Ptr{AVPicture},AVPixelFormat,Cint,Cint),dst,src,pix_fmt,width,height) end function av_picture_crop(dst,src,pix_fmt::AVPixelFormat,top_band::Integer,left_band::Integer) @@ -507,7 +507,7 @@ function av_picture_pad(dst,src,height::Integer,width::Integer,pix_fmt::AVPixelF end function avcodec_get_chroma_sub_sample(pix_fmt::AVPixelFormat,h_shift,v_shift) - ccall((:avcodec_get_chroma_sub_sample,libavcodec),Void,(AVPixelFormat,Ptr{Cint},Ptr{Cint}),pix_fmt,h_shift,v_shift) + ccall((:avcodec_get_chroma_sub_sample,libavcodec),Cvoid,(AVPixelFormat,Ptr{Cint},Ptr{Cint}),pix_fmt,h_shift,v_shift) end function avcodec_pix_fmt_to_codec_tag(pix_fmt::AVPixelFormat) @@ -535,7 +535,7 @@ function avcodec_default_get_format(s,fmt) end function avcodec_set_dimensions(s,width::Integer,height::Integer) - ccall((:avcodec_set_dimensions,libavcodec),Void,(Ptr{AVCodecContext},Cint,Cint),s,width,height) + ccall((:avcodec_set_dimensions,libavcodec),Cvoid,(Ptr{AVCodecContext},Cint,Cint),s,width,height) end function av_get_codec_tag_string(buf,buf_size::Csize_t,codec_tag::Integer) @@ -543,7 +543,7 @@ function av_get_codec_tag_string(buf,buf_size::Csize_t,codec_tag::Integer) end function avcodec_string(buf,buf_size::Integer,enc,encode::Integer) - ccall((:avcodec_string,libavcodec),Void,(Cstring,Cint,Ptr{AVCodecContext},Cint),buf,buf_size,enc,encode) + ccall((:avcodec_string,libavcodec),Cvoid,(Cstring,Cint,Ptr{AVCodecContext},Cint),buf,buf_size,enc,encode) end function av_get_profile_name(codec,profile::Integer) @@ -555,11 +555,11 @@ function avcodec_profile_name(codec_id::AVCodecID,profile::Integer) end function avcodec_default_execute(c,func,arg,ret,count::Integer,size::Integer) - ccall((:avcodec_default_execute,libavcodec),Cint,(Ptr{AVCodecContext},Ptr{Void},Ptr{Void},Ptr{Cint},Cint,Cint),c,func,arg,ret,count,size) + ccall((:avcodec_default_execute,libavcodec),Cint,(Ptr{AVCodecContext},Ptr{Cvoid},Ptr{Cvoid},Ptr{Cint},Cint,Cint),c,func,arg,ret,count,size) end function avcodec_default_execute2(c,func,arg,ret,count::Integer) - ccall((:avcodec_default_execute2,libavcodec),Cint,(Ptr{AVCodecContext},Ptr{Void},Ptr{Void},Ptr{Cint},Cint),c,func,arg,ret,count) + ccall((:avcodec_default_execute2,libavcodec),Cint,(Ptr{AVCodecContext},Ptr{Cvoid},Ptr{Cvoid},Ptr{Cint},Cint),c,func,arg,ret,count) end function avcodec_fill_audio_frame(frame,nb_channels::Integer,sample_fmt::AVSampleFormat,buf,buf_size::Integer,align::Integer) @@ -567,7 +567,7 @@ function avcodec_fill_audio_frame(frame,nb_channels::Integer,sample_fmt::AVSampl end function avcodec_flush_buffers(avctx) - ccall((:avcodec_flush_buffers,libavcodec),Void,(Ptr{AVCodecContext},),avctx) + ccall((:avcodec_flush_buffers,libavcodec),Cvoid,(Ptr{AVCodecContext},),avctx) end function av_get_bits_per_sample(codec_id::AVCodecID) @@ -587,7 +587,7 @@ function av_get_audio_frame_duration(avctx,frame_bytes::Integer) end function av_register_bitstream_filter(bsf) - ccall((:av_register_bitstream_filter,libavcodec),Void,(Ptr{AVBitStreamFilter},),bsf) + ccall((:av_register_bitstream_filter,libavcodec),Cvoid,(Ptr{AVBitStreamFilter},),bsf) end function av_bitstream_filter_init(name) @@ -599,7 +599,7 @@ function av_bitstream_filter_filter(bsfc,avctx,args,poutbuf,poutbuf_size,buf,buf end function av_bitstream_filter_close(bsf) - ccall((:av_bitstream_filter_close,libavcodec),Void,(Ptr{AVBitStreamFilterContext},),bsf) + ccall((:av_bitstream_filter_close,libavcodec),Cvoid,(Ptr{AVBitStreamFilterContext},),bsf) end function av_bitstream_filter_next(f) @@ -607,11 +607,11 @@ function av_bitstream_filter_next(f) end function av_fast_padded_malloc(ptr,size,min_size::Csize_t) - ccall((:av_fast_padded_malloc,libavcodec),Void,(Ptr{Void},Ptr{UInt32},Csize_t),ptr,size,min_size) + ccall((:av_fast_padded_malloc,libavcodec),Cvoid,(Ptr{Cvoid},Ptr{UInt32},Csize_t),ptr,size,min_size) end function av_fast_padded_mallocz(ptr,size,min_size::Csize_t) - ccall((:av_fast_padded_mallocz,libavcodec),Void,(Ptr{Void},Ptr{UInt32},Csize_t),ptr,size,min_size) + ccall((:av_fast_padded_mallocz,libavcodec),Cvoid,(Ptr{Cvoid},Ptr{UInt32},Csize_t),ptr,size,min_size) end function av_xiphlacing(s,v::Integer) @@ -619,11 +619,11 @@ function av_xiphlacing(s,v::Integer) end function av_log_missing_feature(avc,feature,want_sample::Integer) - ccall((:av_log_missing_feature,libavcodec),Void,(Ptr{Void},Cstring,Cint),avc,feature,want_sample) + ccall((:av_log_missing_feature,libavcodec),Cvoid,(Ptr{Cvoid},Cstring,Cint),avc,feature,want_sample) end function av_register_hwaccel(hwaccel) - ccall((:av_register_hwaccel,libavcodec),Void,(Ptr{AVHWAccel},),hwaccel) + ccall((:av_register_hwaccel,libavcodec),Cvoid,(Ptr{AVHWAccel},),hwaccel) end function av_hwaccel_next(hwaccel) @@ -631,7 +631,7 @@ function av_hwaccel_next(hwaccel) end function av_lockmgr_register(cb) - ccall((:av_lockmgr_register,libavcodec),Cint,(Ptr{Void},),cb) + ccall((:av_lockmgr_register,libavcodec),Cint,(Ptr{Cvoid},),cb) end function avcodec_get_type(codec_id::AVCodecID) diff --git a/src/ffmpeg/AVCodecs/v57/dirac.jl b/src/ffmpeg/AVCodecs/v57/dirac.jl index 39b4ba08..b6e56dc3 100644 --- a/src/ffmpeg/AVCodecs/v57/dirac.jl +++ b/src/ffmpeg/AVCodecs/v57/dirac.jl @@ -7,5 +7,5 @@ export function av_dirac_parse_sequence_header(dsh,buf,buf_size::Csize_t,log_ctx) - ccall((:av_dirac_parse_sequence_header,libavcodec),Cint,(Ptr{Ptr{AVDiracSeqHeader}},Ptr{UInt8},Csize_t,Ptr{Void}),dsh,buf,buf_size,log_ctx) + ccall((:av_dirac_parse_sequence_header,libavcodec),Cint,(Ptr{Ptr{AVDiracSeqHeader}},Ptr{UInt8},Csize_t,Ptr{Cvoid}),dsh,buf,buf_size,log_ctx) end diff --git a/src/ffmpeg/AVCodecs/v57/libavcodec_h.jl b/src/ffmpeg/AVCodecs/v57/libavcodec_h.jl index b22e6ca5..d726eaa4 100644 --- a/src/ffmpeg/AVCodecs/v57/libavcodec_h.jl +++ b/src/ffmpeg/AVCodecs/v57/libavcodec_h.jl @@ -1597,7 +1597,7 @@ const AV_SIDE_DATA_PARAM_CHANGE_SAMPLE_RATE = (UInt32)(4) const AV_SIDE_DATA_PARAM_CHANGE_DIMENSIONS = (UInt32)(8) # end enum AVSideDataParamChangeFlags -const AVCodecInternal = Void +const AVCodecInternal = Nothing # begin enum AVFieldOrder const AVFieldOrder = UInt32 @@ -1609,7 +1609,7 @@ const AV_FIELD_TB = (UInt32)(4) const AV_FIELD_BT = (UInt32)(5) # end enum AVFieldOrder -const AVCodecDefault = Void +const AVCodecDefault = Nothing struct AVCodec name::Cstring @@ -1627,16 +1627,16 @@ struct AVCodec profiles::Ptr{AVProfile} priv_data_size::Cint next::Ptr{AVCodec} - init_thread_copy::Ptr{Void} - update_thread_context::Ptr{Void} + init_thread_copy::Ptr{Cvoid} + update_thread_context::Ptr{Cvoid} defaults::Ptr{AVCodecDefault} - init_static_data::Ptr{Void} - init::Ptr{Void} - encode_sub::Ptr{Void} - encode2::Ptr{Void} - decode::Ptr{Void} - close::Ptr{Void} - flush::Ptr{Void} + init_static_data::Ptr{Cvoid} + init::Ptr{Cvoid} + encode_sub::Ptr{Cvoid} + encode2::Ptr{Cvoid} + decode::Ptr{Cvoid} + close::Ptr{Cvoid} + flush::Ptr{Cvoid} caps_internal::Cint end @@ -1647,14 +1647,14 @@ struct AVHWAccel pix_fmt::AVPixelFormat capabilities::Cint next::Ptr{AVHWAccel} - alloc_frame::Ptr{Void} - start_frame::Ptr{Void} - decode_slice::Ptr{Void} - end_frame::Ptr{Void} + alloc_frame::Ptr{Cvoid} + start_frame::Ptr{Cvoid} + decode_slice::Ptr{Cvoid} + end_frame::Ptr{Cvoid} frame_priv_data_size::Cint - decode_mb::Ptr{Void} - init::Ptr{Void} - uninit::Ptr{Void} + decode_mb::Ptr{Cvoid} + init::Ptr{Cvoid} + uninit::Ptr{Cvoid} priv_data_size::Cint end @@ -1669,9 +1669,9 @@ struct AVCodecContext codec_id::AVCodecID codec_tag::UInt32 stream_codec_tag::UInt32 - priv_data::Ptr{Void} + priv_data::Ptr{Cvoid} internal::Ptr{AVCodecInternal} - opaque::Ptr{Void} + opaque::Ptr{Cvoid} bit_rate::Int64 bit_rate_tolerance::Cint global_quality::Cint @@ -1690,8 +1690,8 @@ struct AVCodecContext gop_size::Cint pix_fmt::AVPixelFormat me_method::Cint - draw_horiz_band::Ptr{Void} - get_format::Ptr{Void} + draw_horiz_band::Ptr{Cvoid} + get_format::Ptr{Cvoid} max_b_frames::Cint b_quant_factor::Cfloat rc_strategy::Cint @@ -1766,7 +1766,7 @@ struct AVCodecContext request_channel_layout::UInt64 audio_service_type::AVAudioServiceType request_sample_fmt::AVSampleFormat - get_buffer2::Ptr{Void} + get_buffer2::Ptr{Cvoid} refcounted_frames::Cint qcompress::Cfloat qblur::Cfloat @@ -1799,7 +1799,7 @@ struct AVCodecContext min_prediction_order::Cint max_prediction_order::Cint timecode_frame_start::Int64 - rtp_callback::Ptr{Void} + rtp_callback::Ptr{Cvoid} rtp_payload_size::Cint mv_bits::Cint header_bits::Cint @@ -1820,7 +1820,7 @@ struct AVCodecContext err_recognition::Cint reordered_opaque::Int64 hwaccel::Ptr{AVHWAccel} - hwaccel_context::Ptr{Void} + hwaccel_context::Ptr{Cvoid} error::NTuple{8,UInt64} dct_algo::Cint idct_algo::Cint @@ -1832,8 +1832,8 @@ struct AVCodecContext thread_type::Cint active_thread_type::Cint thread_safe_callbacks::Cint - execute::Ptr{Void} - execute2::Ptr{Void} + execute::Ptr{Cvoid} + execute2::Ptr{Cvoid} nsse_weight::Cint profile::Cint level::Cint @@ -1903,7 +1903,7 @@ struct AVSubtitle pts::Int64 end -const MpegEncContext = Void +const MpegEncContext = Nothing # begin enum AVPictureStructure const AVPictureStructure = UInt32 @@ -1916,15 +1916,15 @@ const AV_PICTURE_STRUCTURE_FRAME = (UInt32)(3) struct AVCodecParser codec_ids::NTuple{5,Cint} priv_data_size::Cint - parser_init::Ptr{Void} - parser_parse::Ptr{Void} - parser_close::Ptr{Void} - split::Ptr{Void} + parser_init::Ptr{Cvoid} + parser_parse::Ptr{Cvoid} + parser_close::Ptr{Cvoid} + split::Ptr{Cvoid} next::Ptr{AVCodecParser} end struct AVCodecParserContext - priv_data::Ptr{Void} + priv_data::Ptr{Cvoid} parser::Ptr{AVCodecParser} frame_offset::Int64 cur_offset::Int64 @@ -1962,19 +1962,19 @@ struct AVCodecParserContext format::Cint end -const ReSampleContext = Void -const AVResampleContext = Void +const ReSampleContext = Nothing +const AVResampleContext = Nothing struct AVBitStreamFilter name::Cstring priv_data_size::Cint - filter::Ptr{Void} - close::Ptr{Void} + filter::Ptr{Cvoid} + close::Ptr{Cvoid} next::Ptr{AVBitStreamFilter} end struct AVBitStreamFilterContext - priv_data::Ptr{Void} + priv_data::Ptr{Cvoid} filter::Ptr{AVBitStreamFilter} parser::Ptr{AVCodecParserContext} next::Ptr{AVBitStreamFilterContext} @@ -2056,12 +2056,12 @@ const LIBAVCODEC_VERSION_MICRO = 102 struct AVDCT av_class::Ptr{AVClass} - idct::Ptr{Void} + idct::Ptr{Cvoid} idct_permutation::NTuple{64,UInt8} - fdct::Ptr{Void} + fdct::Ptr{Cvoid} dct_algo::Cint idct_algo::Cint - get_pixels::Ptr{Void} + get_pixels::Ptr{Cvoid} bits_per_sample::Cint end @@ -2152,7 +2152,7 @@ struct AVDVProfile audio_stride::Cint audio_min_samples::NTuple{3,Cint} audio_samples_dist::NTuple{5,Cint} - audio_shuffle::Ptr{Void} + audio_shuffle::Ptr{Cvoid} end struct AVQSVContext @@ -2167,7 +2167,7 @@ struct AVQSVContext end struct vaapi_context - display::Ptr{Void} + display::Ptr{Cvoid} config_id::UInt32 context_id::UInt32 pic_param_buf_id::UInt32 @@ -2176,7 +2176,7 @@ struct vaapi_context slice_buf_ids::Ptr{UInt32} n_slice_buf_ids::UInt32 slice_buf_ids_alloc::UInt32 - slice_params::Ptr{Void} + slice_params::Ptr{Cvoid} slice_param_size::UInt32 slice_params_alloc::UInt32 slice_count::UInt32 @@ -2191,7 +2191,7 @@ struct AVVDPAUPictureInfo _AVVDPAUPictureInfo::Cint end -const AVVDPAU_Render2 = Ptr{Void} +const AVVDPAU_Render2 = Ptr{Cvoid} struct AVVDPAUContext decoder::Cint @@ -2226,6 +2226,6 @@ const VORBIS_FLAG_HEADER = 0x00000001 const VORBIS_FLAG_COMMENT = 0x00000002 const VORBIS_FLAG_SETUP = 0x00000004 -const AVVorbisParseContext = Void +const AVVorbisParseContext = Nothing const AV_XVMC_ID = 0x1dc711c0 diff --git a/src/ffmpeg/AVCodecs/v57/vdpau.jl b/src/ffmpeg/AVCodecs/v57/vdpau.jl index f050d6a2..b40d6781 100644 --- a/src/ffmpeg/AVCodecs/v57/vdpau.jl +++ b/src/ffmpeg/AVCodecs/v57/vdpau.jl @@ -21,7 +21,7 @@ function av_vdpau_hwaccel_get_render2(arg1) end function av_vdpau_hwaccel_set_render2(arg1,arg2::AVVDPAU_Render2) - ccall((:av_vdpau_hwaccel_set_render2,libavcodec),Void,(Ptr{AVVDPAUContext},AVVDPAU_Render2),arg1,arg2) + ccall((:av_vdpau_hwaccel_set_render2,libavcodec),Cvoid,(Ptr{AVVDPAUContext},AVVDPAU_Render2),arg1,arg2) end function av_vdpau_bind_context(avctx,device::Integer,get_proc_address,flags::Integer) diff --git a/src/ffmpeg/AVCodecs/v57/videotoolbox.jl b/src/ffmpeg/AVCodecs/v57/videotoolbox.jl index 03f7bb6e..853ca75e 100644 --- a/src/ffmpeg/AVCodecs/v57/videotoolbox.jl +++ b/src/ffmpeg/AVCodecs/v57/videotoolbox.jl @@ -22,5 +22,5 @@ function av_videotoolbox_default_init2(avctx,vtctx) end function av_videotoolbox_default_free(avctx) - ccall((:av_videotoolbox_default_free,libavcodec),Void,(Ptr{AVCodecContext},),avctx) + ccall((:av_videotoolbox_default_free,libavcodec),Cvoid,(Ptr{AVCodecContext},),avctx) end diff --git a/src/ffmpeg/AVCodecs/v57/vorbis_parser.jl b/src/ffmpeg/AVCodecs/v57/vorbis_parser.jl index eb5c34c3..53248121 100644 --- a/src/ffmpeg/AVCodecs/v57/vorbis_parser.jl +++ b/src/ffmpeg/AVCodecs/v57/vorbis_parser.jl @@ -15,7 +15,7 @@ function av_vorbis_parse_init(extradata,extradata_size::Integer) end function av_vorbis_parse_free(s) - ccall((:av_vorbis_parse_free,libavcodec),Void,(Ptr{Ptr{AVVorbisParseContext}},),s) + ccall((:av_vorbis_parse_free,libavcodec),Cvoid,(Ptr{Ptr{AVVorbisParseContext}},),s) end function av_vorbis_parse_frame_flags(s,buf,buf_size::Integer,flags) @@ -27,5 +27,5 @@ function av_vorbis_parse_frame(s,buf,buf_size::Integer) end function av_vorbis_parse_reset(s) - ccall((:av_vorbis_parse_reset,libavcodec),Void,(Ptr{AVVorbisParseContext},),s) + ccall((:av_vorbis_parse_reset,libavcodec),Cvoid,(Ptr{AVVorbisParseContext},),s) end diff --git a/src/ffmpeg/AVDevice/v53/avdevice.jl b/src/ffmpeg/AVDevice/v53/avdevice.jl index b61163c9..33ae84d6 100644 --- a/src/ffmpeg/AVDevice/v53/avdevice.jl +++ b/src/ffmpeg/AVDevice/v53/avdevice.jl @@ -32,7 +32,7 @@ function avdevice_license() end function avdevice_register_all() - ccall((:avdevice_register_all,libavdevice),Void,()) + ccall((:avdevice_register_all,libavdevice),Cvoid,()) end function av_input_audio_device_next(d) @@ -52,11 +52,11 @@ function av_output_video_device_next(d) end function avdevice_app_to_dev_control_message(s,_type::AVAppToDevMessageType,data,data_size::Csize_t) - ccall((:avdevice_app_to_dev_control_message,libavdevice),Cint,(Ptr{AVFormatContext},AVAppToDevMessageType,Ptr{Void},Csize_t),s,_type,data,data_size) + ccall((:avdevice_app_to_dev_control_message,libavdevice),Cint,(Ptr{AVFormatContext},AVAppToDevMessageType,Ptr{Cvoid},Csize_t),s,_type,data,data_size) end function avdevice_dev_to_app_control_message(s,_type::AVDevToAppMessageType,data,data_size::Csize_t) - ccall((:avdevice_dev_to_app_control_message,libavdevice),Cint,(Ptr{AVFormatContext},AVDevToAppMessageType,Ptr{Void},Csize_t),s,_type,data,data_size) + ccall((:avdevice_dev_to_app_control_message,libavdevice),Cint,(Ptr{AVFormatContext},AVDevToAppMessageType,Ptr{Cvoid},Csize_t),s,_type,data,data_size) end function avdevice_capabilities_create(caps,s,device_options) @@ -64,7 +64,7 @@ function avdevice_capabilities_create(caps,s,device_options) end function avdevice_capabilities_free(caps,s) - ccall((:avdevice_capabilities_free,libavdevice),Void,(Ptr{Ptr{AVDeviceCapabilitiesQuery}},Ptr{AVFormatContext}),caps,s) + ccall((:avdevice_capabilities_free,libavdevice),Cvoid,(Ptr{Ptr{AVDeviceCapabilitiesQuery}},Ptr{AVFormatContext}),caps,s) end function avdevice_list_devices(s,device_list) @@ -72,5 +72,5 @@ function avdevice_list_devices(s,device_list) end function avdevice_free_list_devices(device_list) - ccall((:avdevice_free_list_devices,libavdevice),Void,(Ptr{Ptr{AVDeviceInfoList}},),device_list) + ccall((:avdevice_free_list_devices,libavdevice),Cvoid,(Ptr{Ptr{AVDeviceInfoList}},),device_list) end diff --git a/src/ffmpeg/AVDevice/v55/avdevice.jl b/src/ffmpeg/AVDevice/v55/avdevice.jl index b61163c9..33ae84d6 100644 --- a/src/ffmpeg/AVDevice/v55/avdevice.jl +++ b/src/ffmpeg/AVDevice/v55/avdevice.jl @@ -32,7 +32,7 @@ function avdevice_license() end function avdevice_register_all() - ccall((:avdevice_register_all,libavdevice),Void,()) + ccall((:avdevice_register_all,libavdevice),Cvoid,()) end function av_input_audio_device_next(d) @@ -52,11 +52,11 @@ function av_output_video_device_next(d) end function avdevice_app_to_dev_control_message(s,_type::AVAppToDevMessageType,data,data_size::Csize_t) - ccall((:avdevice_app_to_dev_control_message,libavdevice),Cint,(Ptr{AVFormatContext},AVAppToDevMessageType,Ptr{Void},Csize_t),s,_type,data,data_size) + ccall((:avdevice_app_to_dev_control_message,libavdevice),Cint,(Ptr{AVFormatContext},AVAppToDevMessageType,Ptr{Cvoid},Csize_t),s,_type,data,data_size) end function avdevice_dev_to_app_control_message(s,_type::AVDevToAppMessageType,data,data_size::Csize_t) - ccall((:avdevice_dev_to_app_control_message,libavdevice),Cint,(Ptr{AVFormatContext},AVDevToAppMessageType,Ptr{Void},Csize_t),s,_type,data,data_size) + ccall((:avdevice_dev_to_app_control_message,libavdevice),Cint,(Ptr{AVFormatContext},AVDevToAppMessageType,Ptr{Cvoid},Csize_t),s,_type,data,data_size) end function avdevice_capabilities_create(caps,s,device_options) @@ -64,7 +64,7 @@ function avdevice_capabilities_create(caps,s,device_options) end function avdevice_capabilities_free(caps,s) - ccall((:avdevice_capabilities_free,libavdevice),Void,(Ptr{Ptr{AVDeviceCapabilitiesQuery}},Ptr{AVFormatContext}),caps,s) + ccall((:avdevice_capabilities_free,libavdevice),Cvoid,(Ptr{Ptr{AVDeviceCapabilitiesQuery}},Ptr{AVFormatContext}),caps,s) end function avdevice_list_devices(s,device_list) @@ -72,5 +72,5 @@ function avdevice_list_devices(s,device_list) end function avdevice_free_list_devices(device_list) - ccall((:avdevice_free_list_devices,libavdevice),Void,(Ptr{Ptr{AVDeviceInfoList}},),device_list) + ccall((:avdevice_free_list_devices,libavdevice),Cvoid,(Ptr{Ptr{AVDeviceInfoList}},),device_list) end diff --git a/src/ffmpeg/AVDevice/v56/avdevice.jl b/src/ffmpeg/AVDevice/v56/avdevice.jl index a1f262b1..1b355070 100644 --- a/src/ffmpeg/AVDevice/v56/avdevice.jl +++ b/src/ffmpeg/AVDevice/v56/avdevice.jl @@ -32,7 +32,7 @@ function avdevice_license() end function avdevice_register_all() - ccall((:avdevice_register_all,libavdevice),Void,()) + ccall((:avdevice_register_all,libavdevice),Cvoid,()) end function av_input_audio_device_next(d) @@ -52,11 +52,11 @@ function av_output_video_device_next(d) end function avdevice_app_to_dev_control_message(s,_type::AVAppToDevMessageType,data,data_size::Csize_t) - ccall((:avdevice_app_to_dev_control_message,libavdevice),Cint,(Ptr{AVFormatContext},AVAppToDevMessageType,Ptr{Void},Csize_t),s,_type,data,data_size) + ccall((:avdevice_app_to_dev_control_message,libavdevice),Cint,(Ptr{AVFormatContext},AVAppToDevMessageType,Ptr{Cvoid},Csize_t),s,_type,data,data_size) end function avdevice_dev_to_app_control_message(s,_type::AVDevToAppMessageType,data,data_size::Csize_t) - ccall((:avdevice_dev_to_app_control_message,libavdevice),Cint,(Ptr{AVFormatContext},AVDevToAppMessageType,Ptr{Void},Csize_t),s,_type,data,data_size) + ccall((:avdevice_dev_to_app_control_message,libavdevice),Cint,(Ptr{AVFormatContext},AVDevToAppMessageType,Ptr{Cvoid},Csize_t),s,_type,data,data_size) end function avdevice_capabilities_create(caps,s,device_options) @@ -64,7 +64,7 @@ function avdevice_capabilities_create(caps,s,device_options) end function avdevice_capabilities_free(caps,s) - ccall((:avdevice_capabilities_free,libavdevice),Void,(Ptr{Ptr{AVDeviceCapabilitiesQuery}},Ptr{AVFormatContext}),caps,s) + ccall((:avdevice_capabilities_free,libavdevice),Cvoid,(Ptr{Ptr{AVDeviceCapabilitiesQuery}},Ptr{AVFormatContext}),caps,s) end function avdevice_list_devices(s,device_list) @@ -72,5 +72,5 @@ function avdevice_list_devices(s,device_list) end function avdevice_free_list_devices(device_list) - ccall((:avdevice_free_list_devices,libavdevice),Void,(Ptr{Ptr{AVDeviceInfoList}},),device_list) + ccall((:avdevice_free_list_devices,libavdevice),Cvoid,(Ptr{Ptr{AVDeviceInfoList}},),device_list) end diff --git a/src/ffmpeg/AVDevice/v57/avdevice.jl b/src/ffmpeg/AVDevice/v57/avdevice.jl index dbc39411..0641bfe0 100644 --- a/src/ffmpeg/AVDevice/v57/avdevice.jl +++ b/src/ffmpeg/AVDevice/v57/avdevice.jl @@ -34,7 +34,7 @@ function avdevice_license() end function avdevice_register_all() - ccall((:avdevice_register_all,libavdevice),Void,()) + ccall((:avdevice_register_all,libavdevice),Cvoid,()) end function av_input_audio_device_next(d) @@ -54,11 +54,11 @@ function av_output_video_device_next(d) end function avdevice_app_to_dev_control_message(s,_type::AVAppToDevMessageType,data,data_size::Csize_t) - ccall((:avdevice_app_to_dev_control_message,libavdevice),Cint,(Ptr{AVFormatContext},AVAppToDevMessageType,Ptr{Void},Csize_t),s,_type,data,data_size) + ccall((:avdevice_app_to_dev_control_message,libavdevice),Cint,(Ptr{AVFormatContext},AVAppToDevMessageType,Ptr{Cvoid},Csize_t),s,_type,data,data_size) end function avdevice_dev_to_app_control_message(s,_type::AVDevToAppMessageType,data,data_size::Csize_t) - ccall((:avdevice_dev_to_app_control_message,libavdevice),Cint,(Ptr{AVFormatContext},AVDevToAppMessageType,Ptr{Void},Csize_t),s,_type,data,data_size) + ccall((:avdevice_dev_to_app_control_message,libavdevice),Cint,(Ptr{AVFormatContext},AVDevToAppMessageType,Ptr{Cvoid},Csize_t),s,_type,data,data_size) end function avdevice_capabilities_create(caps,s,device_options) @@ -66,7 +66,7 @@ function avdevice_capabilities_create(caps,s,device_options) end function avdevice_capabilities_free(caps,s) - ccall((:avdevice_capabilities_free,libavdevice),Void,(Ptr{Ptr{AVDeviceCapabilitiesQuery}},Ptr{AVFormatContext}),caps,s) + ccall((:avdevice_capabilities_free,libavdevice),Cvoid,(Ptr{Ptr{AVDeviceCapabilitiesQuery}},Ptr{AVFormatContext}),caps,s) end function avdevice_list_devices(s,device_list) @@ -74,7 +74,7 @@ function avdevice_list_devices(s,device_list) end function avdevice_free_list_devices(device_list) - ccall((:avdevice_free_list_devices,libavdevice),Void,(Ptr{Ptr{AVDeviceInfoList}},),device_list) + ccall((:avdevice_free_list_devices,libavdevice),Cvoid,(Ptr{Ptr{AVDeviceInfoList}},),device_list) end function avdevice_list_input_sources(device,device_name,device_options,device_list) diff --git a/src/ffmpeg/AVFilters/v2/avfilter.jl b/src/ffmpeg/AVFilters/v2/avfilter.jl index 2f6e9de1..68abbe6f 100644 --- a/src/ffmpeg/AVFilters/v2/avfilter.jl +++ b/src/ffmpeg/AVFilters/v2/avfilter.jl @@ -71,7 +71,7 @@ function avfilter_license() end function avfilter_copy_buffer_ref_props(dst,src) - ccall((:avfilter_copy_buffer_ref_props,libavfilter),Void,(Ptr{AVFilterBufferRef},Ptr{AVFilterBufferRef}),dst,src) + ccall((:avfilter_copy_buffer_ref_props,libavfilter),Cvoid,(Ptr{AVFilterBufferRef},Ptr{AVFilterBufferRef}),dst,src) end function avfilter_ref_buffer(ref,pmask::Integer) @@ -79,7 +79,7 @@ function avfilter_ref_buffer(ref,pmask::Integer) end function avfilter_unref_buffer(ref) - ccall((:avfilter_unref_buffer,libavfilter),Void,(Ptr{AVFilterBufferRef},),ref) + ccall((:avfilter_unref_buffer,libavfilter),Cvoid,(Ptr{AVFilterBufferRef},),ref) end function avfilter_make_format_list(fmts) @@ -99,31 +99,31 @@ function avfilter_merge_formats(a,b) end function avfilter_formats_ref(formats,ref) - ccall((:avfilter_formats_ref,libavfilter),Void,(Ptr{AVFilterFormats},Ptr{Ptr{AVFilterFormats}}),formats,ref) + ccall((:avfilter_formats_ref,libavfilter),Cvoid,(Ptr{AVFilterFormats},Ptr{Ptr{AVFilterFormats}}),formats,ref) end function avfilter_formats_unref(ref) - ccall((:avfilter_formats_unref,libavfilter),Void,(Ptr{Ptr{AVFilterFormats}},),ref) + ccall((:avfilter_formats_unref,libavfilter),Cvoid,(Ptr{Ptr{AVFilterFormats}},),ref) end function avfilter_formats_changeref(oldref,newref) - ccall((:avfilter_formats_changeref,libavfilter),Void,(Ptr{Ptr{AVFilterFormats}},Ptr{Ptr{AVFilterFormats}}),oldref,newref) + ccall((:avfilter_formats_changeref,libavfilter),Cvoid,(Ptr{Ptr{AVFilterFormats}},Ptr{Ptr{AVFilterFormats}}),oldref,newref) end function avfilter_default_start_frame(link,picref) - ccall((:avfilter_default_start_frame,libavfilter),Void,(Ptr{AVFilterLink},Ptr{AVFilterBufferRef}),link,picref) + ccall((:avfilter_default_start_frame,libavfilter),Cvoid,(Ptr{AVFilterLink},Ptr{AVFilterBufferRef}),link,picref) end function avfilter_default_draw_slice(link,y::Integer,h::Integer,slice_dir::Integer) - ccall((:avfilter_default_draw_slice,libavfilter),Void,(Ptr{AVFilterLink},Cint,Cint,Cint),link,y,h,slice_dir) + ccall((:avfilter_default_draw_slice,libavfilter),Cvoid,(Ptr{AVFilterLink},Cint,Cint,Cint),link,y,h,slice_dir) end function avfilter_default_end_frame(link) - ccall((:avfilter_default_end_frame,libavfilter),Void,(Ptr{AVFilterLink},),link) + ccall((:avfilter_default_end_frame,libavfilter),Cvoid,(Ptr{AVFilterLink},),link) end function avfilter_default_filter_samples(link,samplesref) - ccall((:avfilter_default_filter_samples,libavfilter),Void,(Ptr{AVFilterLink},Ptr{AVFilterBufferRef}),link,samplesref) + ccall((:avfilter_default_filter_samples,libavfilter),Cvoid,(Ptr{AVFilterLink},Ptr{AVFilterBufferRef}),link,samplesref) end function avfilter_default_config_output_link(link) @@ -143,7 +143,7 @@ function avfilter_default_get_audio_buffer(link,perms::Integer,sample_fmt::AVSam end function avfilter_set_common_formats(ctx,formats) - ccall((:avfilter_set_common_formats,libavfilter),Void,(Ptr{AVFilterContext},Ptr{AVFilterFormats}),ctx,formats) + ccall((:avfilter_set_common_formats,libavfilter),Cvoid,(Ptr{AVFilterContext},Ptr{AVFilterFormats}),ctx,formats) end function avfilter_default_query_formats(ctx) @@ -151,19 +151,19 @@ function avfilter_default_query_formats(ctx) end function avfilter_null_start_frame(link,picref) - ccall((:avfilter_null_start_frame,libavfilter),Void,(Ptr{AVFilterLink},Ptr{AVFilterBufferRef}),link,picref) + ccall((:avfilter_null_start_frame,libavfilter),Cvoid,(Ptr{AVFilterLink},Ptr{AVFilterBufferRef}),link,picref) end function avfilter_null_draw_slice(link,y::Integer,h::Integer,slice_dir::Integer) - ccall((:avfilter_null_draw_slice,libavfilter),Void,(Ptr{AVFilterLink},Cint,Cint,Cint),link,y,h,slice_dir) + ccall((:avfilter_null_draw_slice,libavfilter),Cvoid,(Ptr{AVFilterLink},Cint,Cint,Cint),link,y,h,slice_dir) end function avfilter_null_end_frame(link) - ccall((:avfilter_null_end_frame,libavfilter),Void,(Ptr{AVFilterLink},),link) + ccall((:avfilter_null_end_frame,libavfilter),Cvoid,(Ptr{AVFilterLink},),link) end function avfilter_null_filter_samples(link,samplesref) - ccall((:avfilter_null_filter_samples,libavfilter),Void,(Ptr{AVFilterLink},Ptr{AVFilterBufferRef}),link,samplesref) + ccall((:avfilter_null_filter_samples,libavfilter),Cvoid,(Ptr{AVFilterLink},Ptr{AVFilterBufferRef}),link,samplesref) end function avfilter_null_get_video_buffer(link,perms::Integer,w::Integer,h::Integer) @@ -203,27 +203,27 @@ function avfilter_poll_frame(link) end function avfilter_start_frame(link,picref) - ccall((:avfilter_start_frame,libavfilter),Void,(Ptr{AVFilterLink},Ptr{AVFilterBufferRef}),link,picref) + ccall((:avfilter_start_frame,libavfilter),Cvoid,(Ptr{AVFilterLink},Ptr{AVFilterBufferRef}),link,picref) end function avfilter_end_frame(link) - ccall((:avfilter_end_frame,libavfilter),Void,(Ptr{AVFilterLink},),link) + ccall((:avfilter_end_frame,libavfilter),Cvoid,(Ptr{AVFilterLink},),link) end function avfilter_draw_slice(link,y::Integer,h::Integer,slice_dir::Integer) - ccall((:avfilter_draw_slice,libavfilter),Void,(Ptr{AVFilterLink},Cint,Cint,Cint),link,y,h,slice_dir) + ccall((:avfilter_draw_slice,libavfilter),Cvoid,(Ptr{AVFilterLink},Cint,Cint,Cint),link,y,h,slice_dir) end function avfilter_filter_samples(link,samplesref) - ccall((:avfilter_filter_samples,libavfilter),Void,(Ptr{AVFilterLink},Ptr{AVFilterBufferRef}),link,samplesref) + ccall((:avfilter_filter_samples,libavfilter),Cvoid,(Ptr{AVFilterLink},Ptr{AVFilterBufferRef}),link,samplesref) end function avfilter_register_all() - ccall((:avfilter_register_all,libavfilter),Void,()) + ccall((:avfilter_register_all,libavfilter),Cvoid,()) end function avfilter_uninit() - ccall((:avfilter_uninit,libavfilter),Void,()) + ccall((:avfilter_uninit,libavfilter),Cvoid,()) end function avfilter_register(filter) @@ -243,11 +243,11 @@ function avfilter_open(filter_ctx,filter,inst_name) end function avfilter_init_filter(filter,args,opaque) - ccall((:avfilter_init_filter,libavfilter),Cint,(Ptr{AVFilterContext},Ptr{UInt8},Ptr{Void}),filter,args,opaque) + ccall((:avfilter_init_filter,libavfilter),Cint,(Ptr{AVFilterContext},Ptr{UInt8},Ptr{Cvoid}),filter,args,opaque) end function avfilter_free(filter) - ccall((:avfilter_free,libavfilter),Void,(Ptr{AVFilterContext},),filter) + ccall((:avfilter_free,libavfilter),Cvoid,(Ptr{AVFilterContext},),filter) end function avfilter_insert_filter(link,filt,filt_srcpad_idx::Integer,filt_dstpad_idx::Integer) @@ -255,15 +255,15 @@ function avfilter_insert_filter(link,filt,filt_srcpad_idx::Integer,filt_dstpad_i end function avfilter_insert_pad(idx::Integer,count,padidx_off::Csize_t,pads,links,newpad) - ccall((:avfilter_insert_pad,libavfilter),Void,(UInt32,Ptr{UInt32},Csize_t,Ptr{Ptr{AVFilterPad}},Ptr{Ptr{Ptr{AVFilterLink}}},Ptr{AVFilterPad}),idx,count,padidx_off,pads,links,newpad) + ccall((:avfilter_insert_pad,libavfilter),Cvoid,(UInt32,Ptr{UInt32},Csize_t,Ptr{Ptr{AVFilterPad}},Ptr{Ptr{Ptr{AVFilterLink}}},Ptr{AVFilterPad}),idx,count,padidx_off,pads,links,newpad) end function avfilter_insert_inpad(f,index::Integer,p) - ccall((:avfilter_insert_inpad,libavfilter),Void,(Ptr{AVFilterContext},UInt32,Ptr{AVFilterPad}),f,index,p) + ccall((:avfilter_insert_inpad,libavfilter),Cvoid,(Ptr{AVFilterContext},UInt32,Ptr{AVFilterPad}),f,index,p) end function avfilter_insert_outpad(f,index::Integer,p) - ccall((:avfilter_insert_outpad,libavfilter),Void,(Ptr{AVFilterContext},UInt32,Ptr{AVFilterPad}),f,index,p) + ccall((:avfilter_insert_outpad,libavfilter),Cvoid,(Ptr{AVFilterContext},UInt32,Ptr{AVFilterPad}),f,index,p) end function avfilter_copy_frame_props(dst,src) diff --git a/src/ffmpeg/AVFilters/v2/avfiltergraph.jl b/src/ffmpeg/AVFilters/v2/avfiltergraph.jl index d68621fc..c084a60f 100644 --- a/src/ffmpeg/AVFilters/v2/avfiltergraph.jl +++ b/src/ffmpeg/AVFilters/v2/avfiltergraph.jl @@ -25,17 +25,17 @@ function avfilter_graph_add_filter(graphctx,filter) end function avfilter_graph_create_filter(filt_ctx,filt,name,args,opaque,graph_ctx) - ccall((:avfilter_graph_create_filter,libavfilter),Cint,(Ptr{Ptr{AVFilterContext}},Ptr{AVFilter},Ptr{UInt8},Ptr{UInt8},Ptr{Void},Ptr{AVFilterGraph}),filt_ctx,filt,name,args,opaque,graph_ctx) + ccall((:avfilter_graph_create_filter,libavfilter),Cint,(Ptr{Ptr{AVFilterContext}},Ptr{AVFilter},Ptr{UInt8},Ptr{UInt8},Ptr{Cvoid},Ptr{AVFilterGraph}),filt_ctx,filt,name,args,opaque,graph_ctx) end function avfilter_graph_config(graphctx,log_ctx) - ccall((:avfilter_graph_config,libavfilter),Cint,(Ptr{AVFilterGraph},Ptr{Void}),graphctx,log_ctx) + ccall((:avfilter_graph_config,libavfilter),Cint,(Ptr{AVFilterGraph},Ptr{Cvoid}),graphctx,log_ctx) end function avfilter_graph_free(graph) - ccall((:avfilter_graph_free,libavfilter),Void,(Ptr{Ptr{AVFilterGraph}},),graph) + ccall((:avfilter_graph_free,libavfilter),Cvoid,(Ptr{Ptr{AVFilterGraph}},),graph) end function avfilter_graph_parse(graph,filters,inputs,outputs,log_ctx) - ccall((:avfilter_graph_parse,libavfilter),Cint,(Ptr{AVFilterGraph},Ptr{UInt8},Ptr{AVFilterInOut},Ptr{AVFilterInOut},Ptr{Void}),graph,filters,inputs,outputs,log_ctx) + ccall((:avfilter_graph_parse,libavfilter),Cint,(Ptr{AVFilterGraph},Ptr{UInt8},Ptr{AVFilterInOut},Ptr{AVFilterInOut},Ptr{Cvoid}),graph,filters,inputs,outputs,log_ctx) end diff --git a/src/ffmpeg/AVFilters/v2/libavfilter_h.jl b/src/ffmpeg/AVFilters/v2/libavfilter_h.jl index 49346b8c..b2cb77ab 100644 --- a/src/ffmpeg/AVFilters/v2/libavfilter_h.jl +++ b/src/ffmpeg/AVFilters/v2/libavfilter_h.jl @@ -65,8 +65,8 @@ struct AVFilterBuffer data::Array_8_Ptr linesize::Array_8_Cint refcount::UInt32 - priv::Ptr{Void} - free::Ptr{Void} + priv::Ptr{Cvoid} + free::Ptr{Cvoid} format::Cint w::Cint h::Cint @@ -113,9 +113,9 @@ end struct AVFilter name::Ptr{UInt8} priv_size::Cint - init::Ptr{Void} - uninit::Ptr{Void} - query_formats::Ptr{Void} + init::Ptr{Cvoid} + uninit::Ptr{Cvoid} + query_formats::Ptr{Cvoid} inputs::Ptr{AVFilterPad} outputs::Ptr{AVFilterPad} description::Ptr{UInt8} diff --git a/src/ffmpeg/AVFilters/v3/avfilter.jl b/src/ffmpeg/AVFilters/v3/avfilter.jl index 90cd6937..a7c32eac 100644 --- a/src/ffmpeg/AVFilters/v3/avfilter.jl +++ b/src/ffmpeg/AVFilters/v3/avfilter.jl @@ -70,7 +70,7 @@ function avfilter_license() end function avfilter_copy_buffer_ref_props(dst,src) - ccall((:avfilter_copy_buffer_ref_props,libavfilter),Void,(Ptr{AVFilterBufferRef},Ptr{AVFilterBufferRef}),dst,src) + ccall((:avfilter_copy_buffer_ref_props,libavfilter),Cvoid,(Ptr{AVFilterBufferRef},Ptr{AVFilterBufferRef}),dst,src) end function avfilter_ref_buffer(ref,pmask::Integer) @@ -78,11 +78,11 @@ function avfilter_ref_buffer(ref,pmask::Integer) end function avfilter_unref_buffer(ref) - ccall((:avfilter_unref_buffer,libavfilter),Void,(Ptr{AVFilterBufferRef},),ref) + ccall((:avfilter_unref_buffer,libavfilter),Cvoid,(Ptr{AVFilterBufferRef},),ref) end function avfilter_unref_bufferp(ref) - ccall((:avfilter_unref_bufferp,libavfilter),Void,(Ptr{Ptr{AVFilterBufferRef}},),ref) + ccall((:avfilter_unref_bufferp,libavfilter),Cvoid,(Ptr{Ptr{AVFilterBufferRef}},),ref) end function avfilter_ref_get_channels(ref) @@ -106,7 +106,7 @@ function avfilter_link(src,srcpad::Integer,dst,dstpad::Integer) end function avfilter_link_free(link) - ccall((:avfilter_link_free,libavfilter),Void,(Ptr{Ptr{AVFilterLink}},),link) + ccall((:avfilter_link_free,libavfilter),Cvoid,(Ptr{Ptr{AVFilterLink}},),link) end function avfilter_link_get_channels(link) @@ -114,7 +114,7 @@ function avfilter_link_get_channels(link) end function avfilter_link_set_closed(link,closed::Integer) - ccall((:avfilter_link_set_closed,libavfilter),Void,(Ptr{AVFilterLink},Cint),link,closed) + ccall((:avfilter_link_set_closed,libavfilter),Cvoid,(Ptr{AVFilterLink},Cint),link,closed) end function avfilter_config_links(filter) @@ -138,11 +138,11 @@ function avfilter_process_command(filter,cmd,arg,res,res_len::Integer,flags::Int end function avfilter_register_all() - ccall((:avfilter_register_all,libavfilter),Void,()) + ccall((:avfilter_register_all,libavfilter),Cvoid,()) end function avfilter_uninit() - ccall((:avfilter_uninit,libavfilter),Void,()) + ccall((:avfilter_uninit,libavfilter),Cvoid,()) end function avfilter_register(filter) @@ -166,7 +166,7 @@ function avfilter_open(filter_ctx,filter,inst_name) end function avfilter_init_filter(filter,args,opaque) - ccall((:avfilter_init_filter,libavfilter),Cint,(Ptr{AVFilterContext},Ptr{UInt8},Ptr{Void}),filter,args,opaque) + ccall((:avfilter_init_filter,libavfilter),Cint,(Ptr{AVFilterContext},Ptr{UInt8},Ptr{Cvoid}),filter,args,opaque) end function avfilter_init_str(ctx,args) @@ -178,7 +178,7 @@ function avfilter_init_dict(ctx,options) end function avfilter_free(filter) - ccall((:avfilter_free,libavfilter),Void,(Ptr{AVFilterContext},),filter) + ccall((:avfilter_free,libavfilter),Cvoid,(Ptr{AVFilterContext},),filter) end function avfilter_insert_filter(link,filt,filt_srcpad_idx::Integer,filt_dstpad_idx::Integer) @@ -214,19 +214,19 @@ function avfilter_graph_add_filter(graphctx,filter) end function avfilter_graph_create_filter(filt_ctx,filt,name,args,opaque,graph_ctx) - ccall((:avfilter_graph_create_filter,libavfilter),Cint,(Ptr{Ptr{AVFilterContext}},Ptr{AVFilter},Ptr{UInt8},Ptr{UInt8},Ptr{Void},Ptr{AVFilterGraph}),filt_ctx,filt,name,args,opaque,graph_ctx) + ccall((:avfilter_graph_create_filter,libavfilter),Cint,(Ptr{Ptr{AVFilterContext}},Ptr{AVFilter},Ptr{UInt8},Ptr{UInt8},Ptr{Cvoid},Ptr{AVFilterGraph}),filt_ctx,filt,name,args,opaque,graph_ctx) end function avfilter_graph_set_auto_convert(graph,flags::Integer) - ccall((:avfilter_graph_set_auto_convert,libavfilter),Void,(Ptr{AVFilterGraph},UInt32),graph,flags) + ccall((:avfilter_graph_set_auto_convert,libavfilter),Cvoid,(Ptr{AVFilterGraph},UInt32),graph,flags) end function avfilter_graph_config(graphctx,log_ctx) - ccall((:avfilter_graph_config,libavfilter),Cint,(Ptr{AVFilterGraph},Ptr{Void}),graphctx,log_ctx) + ccall((:avfilter_graph_config,libavfilter),Cint,(Ptr{AVFilterGraph},Ptr{Cvoid}),graphctx,log_ctx) end function avfilter_graph_free(graph) - ccall((:avfilter_graph_free,libavfilter),Void,(Ptr{Ptr{AVFilterGraph}},),graph) + ccall((:avfilter_graph_free,libavfilter),Cvoid,(Ptr{Ptr{AVFilterGraph}},),graph) end function avfilter_inout_alloc() @@ -234,15 +234,15 @@ function avfilter_inout_alloc() end function avfilter_inout_free(inout) - ccall((:avfilter_inout_free,libavfilter),Void,(Ptr{Ptr{AVFilterInOut}},),inout) + ccall((:avfilter_inout_free,libavfilter),Cvoid,(Ptr{Ptr{AVFilterInOut}},),inout) end function avfilter_graph_parse(graph,filters,inputs,outputs,log_ctx) - ccall((:avfilter_graph_parse,libavfilter),Cint,(Ptr{AVFilterGraph},Ptr{UInt8},Ptr{Ptr{AVFilterInOut}},Ptr{Ptr{AVFilterInOut}},Ptr{Void}),graph,filters,inputs,outputs,log_ctx) + ccall((:avfilter_graph_parse,libavfilter),Cint,(Ptr{AVFilterGraph},Ptr{UInt8},Ptr{Ptr{AVFilterInOut}},Ptr{Ptr{AVFilterInOut}},Ptr{Cvoid}),graph,filters,inputs,outputs,log_ctx) end function avfilter_graph_parse_ptr(graph,filters,inputs,outputs,log_ctx) - ccall((:avfilter_graph_parse_ptr,libavfilter),Cint,(Ptr{AVFilterGraph},Ptr{UInt8},Ptr{Ptr{AVFilterInOut}},Ptr{Ptr{AVFilterInOut}},Ptr{Void}),graph,filters,inputs,outputs,log_ctx) + ccall((:avfilter_graph_parse_ptr,libavfilter),Cint,(Ptr{AVFilterGraph},Ptr{UInt8},Ptr{Ptr{AVFilterInOut}},Ptr{Ptr{AVFilterInOut}},Ptr{Cvoid}),graph,filters,inputs,outputs,log_ctx) end function avfilter_graph_parse2(graph,filters,inputs,outputs) diff --git a/src/ffmpeg/AVFilters/v3/buffersink.jl b/src/ffmpeg/AVFilters/v3/buffersink.jl index c2979a76..35315710 100644 --- a/src/ffmpeg/AVFilters/v3/buffersink.jl +++ b/src/ffmpeg/AVFilters/v3/buffersink.jl @@ -45,7 +45,7 @@ function av_abuffersink_params_alloc() end function av_buffersink_set_frame_size(ctx,frame_size::Integer) - ccall((:av_buffersink_set_frame_size,libavfilter),Void,(Ptr{AVFilterContext},UInt32),ctx,frame_size) + ccall((:av_buffersink_set_frame_size,libavfilter),Cvoid,(Ptr{AVFilterContext},UInt32),ctx,frame_size) end function av_buffersink_get_frame_rate(ctx) diff --git a/src/ffmpeg/AVFilters/v3/libavfilter_h.jl b/src/ffmpeg/AVFilters/v3/libavfilter_h.jl index a6ed9d6f..ddddcfe6 100644 --- a/src/ffmpeg/AVFilters/v3/libavfilter_h.jl +++ b/src/ffmpeg/AVFilters/v3/libavfilter_h.jl @@ -70,7 +70,7 @@ const AVFILTER_CMD_FLAG_FAST = 2 const AVFilterContext = AVFilterContext const AVFilterLink = AVFilterLink const AVFilterPad = AVFilterPad -const AVFilterFormats = Void +const AVFilterFormats = Nothing struct Array_8_Ptr d1::Ptr{UInt8} @@ -102,8 +102,8 @@ struct AVFilterBuffer data::Array_8_Ptr extended_data::Ptr{Ptr{UInt8}} linesize::Array_8_Cint - priv::Ptr{Void} - free::Ptr{Void} + priv::Ptr{Cvoid} + free::Ptr{Cvoid} format::Cint w::Cint h::Cint @@ -152,18 +152,18 @@ struct AVFilter outputs::Ptr{AVFilterPad} priv_class::Ptr{AVClass} flags::Cint - init::Ptr{Void} - init_dict::Ptr{Void} - uninit::Ptr{Void} - query_formats::Ptr{Void} + init::Ptr{Cvoid} + init_dict::Ptr{Cvoid} + uninit::Ptr{Cvoid} + query_formats::Ptr{Cvoid} priv_size::Cint next::Ptr{AVFilter} - process_command::Ptr{Void} - init_opaque::Ptr{Void} + process_command::Ptr{Cvoid} + init_opaque::Ptr{Cvoid} end -const AVFilterInternal = Void -const AVFilterGraphInternal = Void +const AVFilterInternal = Nothing +const AVFilterGraphInternal = Nothing struct AVFilterGraph av_class::Ptr{AVClass} @@ -175,7 +175,7 @@ struct AVFilterGraph thread_type::Cint nb_threads::Cint internal::Ptr{AVFilterGraphInternal} - opaque::Ptr{Void} + opaque::Ptr{Cvoid} execute::Ptr{avfilter_execute_func} aresample_swr_opts::Ptr{UInt8} sink_links::Ptr{Ptr{AVFilterLink}} diff --git a/src/ffmpeg/AVFilters/v4/avfilter.jl b/src/ffmpeg/AVFilters/v4/avfilter.jl index 90cd6937..a7c32eac 100644 --- a/src/ffmpeg/AVFilters/v4/avfilter.jl +++ b/src/ffmpeg/AVFilters/v4/avfilter.jl @@ -70,7 +70,7 @@ function avfilter_license() end function avfilter_copy_buffer_ref_props(dst,src) - ccall((:avfilter_copy_buffer_ref_props,libavfilter),Void,(Ptr{AVFilterBufferRef},Ptr{AVFilterBufferRef}),dst,src) + ccall((:avfilter_copy_buffer_ref_props,libavfilter),Cvoid,(Ptr{AVFilterBufferRef},Ptr{AVFilterBufferRef}),dst,src) end function avfilter_ref_buffer(ref,pmask::Integer) @@ -78,11 +78,11 @@ function avfilter_ref_buffer(ref,pmask::Integer) end function avfilter_unref_buffer(ref) - ccall((:avfilter_unref_buffer,libavfilter),Void,(Ptr{AVFilterBufferRef},),ref) + ccall((:avfilter_unref_buffer,libavfilter),Cvoid,(Ptr{AVFilterBufferRef},),ref) end function avfilter_unref_bufferp(ref) - ccall((:avfilter_unref_bufferp,libavfilter),Void,(Ptr{Ptr{AVFilterBufferRef}},),ref) + ccall((:avfilter_unref_bufferp,libavfilter),Cvoid,(Ptr{Ptr{AVFilterBufferRef}},),ref) end function avfilter_ref_get_channels(ref) @@ -106,7 +106,7 @@ function avfilter_link(src,srcpad::Integer,dst,dstpad::Integer) end function avfilter_link_free(link) - ccall((:avfilter_link_free,libavfilter),Void,(Ptr{Ptr{AVFilterLink}},),link) + ccall((:avfilter_link_free,libavfilter),Cvoid,(Ptr{Ptr{AVFilterLink}},),link) end function avfilter_link_get_channels(link) @@ -114,7 +114,7 @@ function avfilter_link_get_channels(link) end function avfilter_link_set_closed(link,closed::Integer) - ccall((:avfilter_link_set_closed,libavfilter),Void,(Ptr{AVFilterLink},Cint),link,closed) + ccall((:avfilter_link_set_closed,libavfilter),Cvoid,(Ptr{AVFilterLink},Cint),link,closed) end function avfilter_config_links(filter) @@ -138,11 +138,11 @@ function avfilter_process_command(filter,cmd,arg,res,res_len::Integer,flags::Int end function avfilter_register_all() - ccall((:avfilter_register_all,libavfilter),Void,()) + ccall((:avfilter_register_all,libavfilter),Cvoid,()) end function avfilter_uninit() - ccall((:avfilter_uninit,libavfilter),Void,()) + ccall((:avfilter_uninit,libavfilter),Cvoid,()) end function avfilter_register(filter) @@ -166,7 +166,7 @@ function avfilter_open(filter_ctx,filter,inst_name) end function avfilter_init_filter(filter,args,opaque) - ccall((:avfilter_init_filter,libavfilter),Cint,(Ptr{AVFilterContext},Ptr{UInt8},Ptr{Void}),filter,args,opaque) + ccall((:avfilter_init_filter,libavfilter),Cint,(Ptr{AVFilterContext},Ptr{UInt8},Ptr{Cvoid}),filter,args,opaque) end function avfilter_init_str(ctx,args) @@ -178,7 +178,7 @@ function avfilter_init_dict(ctx,options) end function avfilter_free(filter) - ccall((:avfilter_free,libavfilter),Void,(Ptr{AVFilterContext},),filter) + ccall((:avfilter_free,libavfilter),Cvoid,(Ptr{AVFilterContext},),filter) end function avfilter_insert_filter(link,filt,filt_srcpad_idx::Integer,filt_dstpad_idx::Integer) @@ -214,19 +214,19 @@ function avfilter_graph_add_filter(graphctx,filter) end function avfilter_graph_create_filter(filt_ctx,filt,name,args,opaque,graph_ctx) - ccall((:avfilter_graph_create_filter,libavfilter),Cint,(Ptr{Ptr{AVFilterContext}},Ptr{AVFilter},Ptr{UInt8},Ptr{UInt8},Ptr{Void},Ptr{AVFilterGraph}),filt_ctx,filt,name,args,opaque,graph_ctx) + ccall((:avfilter_graph_create_filter,libavfilter),Cint,(Ptr{Ptr{AVFilterContext}},Ptr{AVFilter},Ptr{UInt8},Ptr{UInt8},Ptr{Cvoid},Ptr{AVFilterGraph}),filt_ctx,filt,name,args,opaque,graph_ctx) end function avfilter_graph_set_auto_convert(graph,flags::Integer) - ccall((:avfilter_graph_set_auto_convert,libavfilter),Void,(Ptr{AVFilterGraph},UInt32),graph,flags) + ccall((:avfilter_graph_set_auto_convert,libavfilter),Cvoid,(Ptr{AVFilterGraph},UInt32),graph,flags) end function avfilter_graph_config(graphctx,log_ctx) - ccall((:avfilter_graph_config,libavfilter),Cint,(Ptr{AVFilterGraph},Ptr{Void}),graphctx,log_ctx) + ccall((:avfilter_graph_config,libavfilter),Cint,(Ptr{AVFilterGraph},Ptr{Cvoid}),graphctx,log_ctx) end function avfilter_graph_free(graph) - ccall((:avfilter_graph_free,libavfilter),Void,(Ptr{Ptr{AVFilterGraph}},),graph) + ccall((:avfilter_graph_free,libavfilter),Cvoid,(Ptr{Ptr{AVFilterGraph}},),graph) end function avfilter_inout_alloc() @@ -234,15 +234,15 @@ function avfilter_inout_alloc() end function avfilter_inout_free(inout) - ccall((:avfilter_inout_free,libavfilter),Void,(Ptr{Ptr{AVFilterInOut}},),inout) + ccall((:avfilter_inout_free,libavfilter),Cvoid,(Ptr{Ptr{AVFilterInOut}},),inout) end function avfilter_graph_parse(graph,filters,inputs,outputs,log_ctx) - ccall((:avfilter_graph_parse,libavfilter),Cint,(Ptr{AVFilterGraph},Ptr{UInt8},Ptr{Ptr{AVFilterInOut}},Ptr{Ptr{AVFilterInOut}},Ptr{Void}),graph,filters,inputs,outputs,log_ctx) + ccall((:avfilter_graph_parse,libavfilter),Cint,(Ptr{AVFilterGraph},Ptr{UInt8},Ptr{Ptr{AVFilterInOut}},Ptr{Ptr{AVFilterInOut}},Ptr{Cvoid}),graph,filters,inputs,outputs,log_ctx) end function avfilter_graph_parse_ptr(graph,filters,inputs,outputs,log_ctx) - ccall((:avfilter_graph_parse_ptr,libavfilter),Cint,(Ptr{AVFilterGraph},Ptr{UInt8},Ptr{Ptr{AVFilterInOut}},Ptr{Ptr{AVFilterInOut}},Ptr{Void}),graph,filters,inputs,outputs,log_ctx) + ccall((:avfilter_graph_parse_ptr,libavfilter),Cint,(Ptr{AVFilterGraph},Ptr{UInt8},Ptr{Ptr{AVFilterInOut}},Ptr{Ptr{AVFilterInOut}},Ptr{Cvoid}),graph,filters,inputs,outputs,log_ctx) end function avfilter_graph_parse2(graph,filters,inputs,outputs) diff --git a/src/ffmpeg/AVFilters/v4/buffersink.jl b/src/ffmpeg/AVFilters/v4/buffersink.jl index c2979a76..35315710 100644 --- a/src/ffmpeg/AVFilters/v4/buffersink.jl +++ b/src/ffmpeg/AVFilters/v4/buffersink.jl @@ -45,7 +45,7 @@ function av_abuffersink_params_alloc() end function av_buffersink_set_frame_size(ctx,frame_size::Integer) - ccall((:av_buffersink_set_frame_size,libavfilter),Void,(Ptr{AVFilterContext},UInt32),ctx,frame_size) + ccall((:av_buffersink_set_frame_size,libavfilter),Cvoid,(Ptr{AVFilterContext},UInt32),ctx,frame_size) end function av_buffersink_get_frame_rate(ctx) diff --git a/src/ffmpeg/AVFilters/v4/libavfilter_h.jl b/src/ffmpeg/AVFilters/v4/libavfilter_h.jl index a6ed9d6f..ddddcfe6 100644 --- a/src/ffmpeg/AVFilters/v4/libavfilter_h.jl +++ b/src/ffmpeg/AVFilters/v4/libavfilter_h.jl @@ -70,7 +70,7 @@ const AVFILTER_CMD_FLAG_FAST = 2 const AVFilterContext = AVFilterContext const AVFilterLink = AVFilterLink const AVFilterPad = AVFilterPad -const AVFilterFormats = Void +const AVFilterFormats = Nothing struct Array_8_Ptr d1::Ptr{UInt8} @@ -102,8 +102,8 @@ struct AVFilterBuffer data::Array_8_Ptr extended_data::Ptr{Ptr{UInt8}} linesize::Array_8_Cint - priv::Ptr{Void} - free::Ptr{Void} + priv::Ptr{Cvoid} + free::Ptr{Cvoid} format::Cint w::Cint h::Cint @@ -152,18 +152,18 @@ struct AVFilter outputs::Ptr{AVFilterPad} priv_class::Ptr{AVClass} flags::Cint - init::Ptr{Void} - init_dict::Ptr{Void} - uninit::Ptr{Void} - query_formats::Ptr{Void} + init::Ptr{Cvoid} + init_dict::Ptr{Cvoid} + uninit::Ptr{Cvoid} + query_formats::Ptr{Cvoid} priv_size::Cint next::Ptr{AVFilter} - process_command::Ptr{Void} - init_opaque::Ptr{Void} + process_command::Ptr{Cvoid} + init_opaque::Ptr{Cvoid} end -const AVFilterInternal = Void -const AVFilterGraphInternal = Void +const AVFilterInternal = Nothing +const AVFilterGraphInternal = Nothing struct AVFilterGraph av_class::Ptr{AVClass} @@ -175,7 +175,7 @@ struct AVFilterGraph thread_type::Cint nb_threads::Cint internal::Ptr{AVFilterGraphInternal} - opaque::Ptr{Void} + opaque::Ptr{Cvoid} execute::Ptr{avfilter_execute_func} aresample_swr_opts::Ptr{UInt8} sink_links::Ptr{Ptr{AVFilterLink}} diff --git a/src/ffmpeg/AVFilters/v5/avfilter.jl b/src/ffmpeg/AVFilters/v5/avfilter.jl index 1f7a8826..0d500d99 100644 --- a/src/ffmpeg/AVFilters/v5/avfilter.jl +++ b/src/ffmpeg/AVFilters/v5/avfilter.jl @@ -70,7 +70,7 @@ function avfilter_license() end function avfilter_copy_buffer_ref_props(dst,src) - ccall((:avfilter_copy_buffer_ref_props,libavfilter),Void,(Ptr{AVFilterBufferRef},Ptr{AVFilterBufferRef}),dst,src) + ccall((:avfilter_copy_buffer_ref_props,libavfilter),Cvoid,(Ptr{AVFilterBufferRef},Ptr{AVFilterBufferRef}),dst,src) end function avfilter_ref_buffer(ref,pmask::Integer) @@ -78,11 +78,11 @@ function avfilter_ref_buffer(ref,pmask::Integer) end function avfilter_unref_buffer(ref) - ccall((:avfilter_unref_buffer,libavfilter),Void,(Ptr{AVFilterBufferRef},),ref) + ccall((:avfilter_unref_buffer,libavfilter),Cvoid,(Ptr{AVFilterBufferRef},),ref) end function avfilter_unref_bufferp(ref) - ccall((:avfilter_unref_bufferp,libavfilter),Void,(Ptr{Ptr{AVFilterBufferRef}},),ref) + ccall((:avfilter_unref_bufferp,libavfilter),Cvoid,(Ptr{Ptr{AVFilterBufferRef}},),ref) end function avfilter_ref_get_channels(ref) @@ -106,7 +106,7 @@ function avfilter_link(src,srcpad::Integer,dst,dstpad::Integer) end function avfilter_link_free(link) - ccall((:avfilter_link_free,libavfilter),Void,(Ptr{Ptr{AVFilterLink}},),link) + ccall((:avfilter_link_free,libavfilter),Cvoid,(Ptr{Ptr{AVFilterLink}},),link) end function avfilter_link_get_channels(link) @@ -114,7 +114,7 @@ function avfilter_link_get_channels(link) end function avfilter_link_set_closed(link,closed::Integer) - ccall((:avfilter_link_set_closed,libavfilter),Void,(Ptr{AVFilterLink},Cint),link,closed) + ccall((:avfilter_link_set_closed,libavfilter),Cvoid,(Ptr{AVFilterLink},Cint),link,closed) end function avfilter_config_links(filter) @@ -138,11 +138,11 @@ function avfilter_process_command(filter,cmd,arg,res,res_len::Integer,flags::Int end function avfilter_register_all() - ccall((:avfilter_register_all,libavfilter),Void,()) + ccall((:avfilter_register_all,libavfilter),Cvoid,()) end function avfilter_uninit() - ccall((:avfilter_uninit,libavfilter),Void,()) + ccall((:avfilter_uninit,libavfilter),Cvoid,()) end function avfilter_register(filter) @@ -166,7 +166,7 @@ function avfilter_open(filter_ctx,filter,inst_name) end function avfilter_init_filter(filter,args,opaque) - ccall((:avfilter_init_filter,libavfilter),Cint,(Ptr{AVFilterContext},Ptr{UInt8},Ptr{Void}),filter,args,opaque) + ccall((:avfilter_init_filter,libavfilter),Cint,(Ptr{AVFilterContext},Ptr{UInt8},Ptr{Cvoid}),filter,args,opaque) end function avfilter_init_str(ctx,args) @@ -178,7 +178,7 @@ function avfilter_init_dict(ctx,options) end function avfilter_free(filter) - ccall((:avfilter_free,libavfilter),Void,(Ptr{AVFilterContext},),filter) + ccall((:avfilter_free,libavfilter),Cvoid,(Ptr{AVFilterContext},),filter) end function avfilter_insert_filter(link,filt,filt_srcpad_idx::Integer,filt_dstpad_idx::Integer) @@ -214,19 +214,19 @@ function avfilter_graph_add_filter(graphctx,filter) end function avfilter_graph_create_filter(filt_ctx,filt,name,args,opaque,graph_ctx) - ccall((:avfilter_graph_create_filter,libavfilter),Cint,(Ptr{Ptr{AVFilterContext}},Ptr{AVFilter},Ptr{UInt8},Ptr{UInt8},Ptr{Void},Ptr{AVFilterGraph}),filt_ctx,filt,name,args,opaque,graph_ctx) + ccall((:avfilter_graph_create_filter,libavfilter),Cint,(Ptr{Ptr{AVFilterContext}},Ptr{AVFilter},Ptr{UInt8},Ptr{UInt8},Ptr{Cvoid},Ptr{AVFilterGraph}),filt_ctx,filt,name,args,opaque,graph_ctx) end function avfilter_graph_set_auto_convert(graph,flags::Integer) - ccall((:avfilter_graph_set_auto_convert,libavfilter),Void,(Ptr{AVFilterGraph},UInt32),graph,flags) + ccall((:avfilter_graph_set_auto_convert,libavfilter),Cvoid,(Ptr{AVFilterGraph},UInt32),graph,flags) end function avfilter_graph_config(graphctx,log_ctx) - ccall((:avfilter_graph_config,libavfilter),Cint,(Ptr{AVFilterGraph},Ptr{Void}),graphctx,log_ctx) + ccall((:avfilter_graph_config,libavfilter),Cint,(Ptr{AVFilterGraph},Ptr{Cvoid}),graphctx,log_ctx) end function avfilter_graph_free(graph) - ccall((:avfilter_graph_free,libavfilter),Void,(Ptr{Ptr{AVFilterGraph}},),graph) + ccall((:avfilter_graph_free,libavfilter),Cvoid,(Ptr{Ptr{AVFilterGraph}},),graph) end function avfilter_inout_alloc() @@ -234,15 +234,15 @@ function avfilter_inout_alloc() end function avfilter_inout_free(inout) - ccall((:avfilter_inout_free,libavfilter),Void,(Ptr{Ptr{AVFilterInOut}},),inout) + ccall((:avfilter_inout_free,libavfilter),Cvoid,(Ptr{Ptr{AVFilterInOut}},),inout) end function avfilter_graph_parse(graph,filters,inputs,outputs,log_ctx) - ccall((:avfilter_graph_parse,libavfilter),Cint,(Ptr{AVFilterGraph},Ptr{UInt8},Ptr{AVFilterInOut},Ptr{AVFilterInOut},Ptr{Void}),graph,filters,inputs,outputs,log_ctx) + ccall((:avfilter_graph_parse,libavfilter),Cint,(Ptr{AVFilterGraph},Ptr{UInt8},Ptr{AVFilterInOut},Ptr{AVFilterInOut},Ptr{Cvoid}),graph,filters,inputs,outputs,log_ctx) end function avfilter_graph_parse_ptr(graph,filters,inputs,outputs,log_ctx) - ccall((:avfilter_graph_parse_ptr,libavfilter),Cint,(Ptr{AVFilterGraph},Ptr{UInt8},Ptr{Ptr{AVFilterInOut}},Ptr{Ptr{AVFilterInOut}},Ptr{Void}),graph,filters,inputs,outputs,log_ctx) + ccall((:avfilter_graph_parse_ptr,libavfilter),Cint,(Ptr{AVFilterGraph},Ptr{UInt8},Ptr{Ptr{AVFilterInOut}},Ptr{Ptr{AVFilterInOut}},Ptr{Cvoid}),graph,filters,inputs,outputs,log_ctx) end function avfilter_graph_parse2(graph,filters,inputs,outputs) diff --git a/src/ffmpeg/AVFilters/v5/buffersink.jl b/src/ffmpeg/AVFilters/v5/buffersink.jl index 85d3a283..7521ad07 100644 --- a/src/ffmpeg/AVFilters/v5/buffersink.jl +++ b/src/ffmpeg/AVFilters/v5/buffersink.jl @@ -45,7 +45,7 @@ function av_abuffersink_params_alloc() end function av_buffersink_set_frame_size(ctx,frame_size::Integer) - ccall((:av_buffersink_set_frame_size,libavfilter),Void,(Ptr{AVFilterContext},UInt32),ctx,frame_size) + ccall((:av_buffersink_set_frame_size,libavfilter),Cvoid,(Ptr{AVFilterContext},UInt32),ctx,frame_size) end function av_buffersink_get_frame_rate(ctx) diff --git a/src/ffmpeg/AVFilters/v5/libavfilter_h.jl b/src/ffmpeg/AVFilters/v5/libavfilter_h.jl index a6ed9d6f..ddddcfe6 100644 --- a/src/ffmpeg/AVFilters/v5/libavfilter_h.jl +++ b/src/ffmpeg/AVFilters/v5/libavfilter_h.jl @@ -70,7 +70,7 @@ const AVFILTER_CMD_FLAG_FAST = 2 const AVFilterContext = AVFilterContext const AVFilterLink = AVFilterLink const AVFilterPad = AVFilterPad -const AVFilterFormats = Void +const AVFilterFormats = Nothing struct Array_8_Ptr d1::Ptr{UInt8} @@ -102,8 +102,8 @@ struct AVFilterBuffer data::Array_8_Ptr extended_data::Ptr{Ptr{UInt8}} linesize::Array_8_Cint - priv::Ptr{Void} - free::Ptr{Void} + priv::Ptr{Cvoid} + free::Ptr{Cvoid} format::Cint w::Cint h::Cint @@ -152,18 +152,18 @@ struct AVFilter outputs::Ptr{AVFilterPad} priv_class::Ptr{AVClass} flags::Cint - init::Ptr{Void} - init_dict::Ptr{Void} - uninit::Ptr{Void} - query_formats::Ptr{Void} + init::Ptr{Cvoid} + init_dict::Ptr{Cvoid} + uninit::Ptr{Cvoid} + query_formats::Ptr{Cvoid} priv_size::Cint next::Ptr{AVFilter} - process_command::Ptr{Void} - init_opaque::Ptr{Void} + process_command::Ptr{Cvoid} + init_opaque::Ptr{Cvoid} end -const AVFilterInternal = Void -const AVFilterGraphInternal = Void +const AVFilterInternal = Nothing +const AVFilterGraphInternal = Nothing struct AVFilterGraph av_class::Ptr{AVClass} @@ -175,7 +175,7 @@ struct AVFilterGraph thread_type::Cint nb_threads::Cint internal::Ptr{AVFilterGraphInternal} - opaque::Ptr{Void} + opaque::Ptr{Cvoid} execute::Ptr{avfilter_execute_func} aresample_swr_opts::Ptr{UInt8} sink_links::Ptr{Ptr{AVFilterLink}} diff --git a/src/ffmpeg/AVFilters/v6/avfilter.jl b/src/ffmpeg/AVFilters/v6/avfilter.jl index af1f7206..a71849fc 100644 --- a/src/ffmpeg/AVFilters/v6/avfilter.jl +++ b/src/ffmpeg/AVFilters/v6/avfilter.jl @@ -76,7 +76,7 @@ function avfilter_link(src,srcpad::Integer,dst,dstpad::Integer) end function avfilter_link_free(link) - ccall((:avfilter_link_free,libavfilter),Void,(Ptr{Ptr{AVFilterLink}},),link) + ccall((:avfilter_link_free,libavfilter),Cvoid,(Ptr{Ptr{AVFilterLink}},),link) end function avfilter_link_get_channels(link) @@ -84,7 +84,7 @@ function avfilter_link_get_channels(link) end function avfilter_link_set_closed(link,closed::Integer) - ccall((:avfilter_link_set_closed,libavfilter),Void,(Ptr{AVFilterLink},Cint),link,closed) + ccall((:avfilter_link_set_closed,libavfilter),Cvoid,(Ptr{AVFilterLink},Cint),link,closed) end function avfilter_config_links(filter) @@ -96,11 +96,11 @@ function avfilter_process_command(filter,cmd,arg,res,res_len::Integer,flags::Int end function avfilter_register_all() - ccall((:avfilter_register_all,libavfilter),Void,()) + ccall((:avfilter_register_all,libavfilter),Cvoid,()) end function avfilter_uninit() - ccall((:avfilter_uninit,libavfilter),Void,()) + ccall((:avfilter_uninit,libavfilter),Cvoid,()) end function avfilter_register(filter) @@ -124,7 +124,7 @@ function avfilter_open(filter_ctx,filter,inst_name) end function avfilter_init_filter(filter,args,opaque) - ccall((:avfilter_init_filter,libavfilter),Cint,(Ptr{AVFilterContext},Cstring,Ptr{Void}),filter,args,opaque) + ccall((:avfilter_init_filter,libavfilter),Cint,(Ptr{AVFilterContext},Cstring,Ptr{Cvoid}),filter,args,opaque) end function avfilter_init_str(ctx,args) @@ -136,7 +136,7 @@ function avfilter_init_dict(ctx,options) end function avfilter_free(filter) - ccall((:avfilter_free,libavfilter),Void,(Ptr{AVFilterContext},),filter) + ccall((:avfilter_free,libavfilter),Cvoid,(Ptr{AVFilterContext},),filter) end function avfilter_insert_filter(link,filt,filt_srcpad_idx::Integer,filt_dstpad_idx::Integer) @@ -164,19 +164,19 @@ function avfilter_graph_add_filter(graphctx,filter) end function avfilter_graph_create_filter(filt_ctx,filt,name,args,opaque,graph_ctx) - ccall((:avfilter_graph_create_filter,libavfilter),Cint,(Ptr{Ptr{AVFilterContext}},Ptr{AVFilter},Cstring,Cstring,Ptr{Void},Ptr{AVFilterGraph}),filt_ctx,filt,name,args,opaque,graph_ctx) + ccall((:avfilter_graph_create_filter,libavfilter),Cint,(Ptr{Ptr{AVFilterContext}},Ptr{AVFilter},Cstring,Cstring,Ptr{Cvoid},Ptr{AVFilterGraph}),filt_ctx,filt,name,args,opaque,graph_ctx) end function avfilter_graph_set_auto_convert(graph,flags::Integer) - ccall((:avfilter_graph_set_auto_convert,libavfilter),Void,(Ptr{AVFilterGraph},UInt32),graph,flags) + ccall((:avfilter_graph_set_auto_convert,libavfilter),Cvoid,(Ptr{AVFilterGraph},UInt32),graph,flags) end function avfilter_graph_config(graphctx,log_ctx) - ccall((:avfilter_graph_config,libavfilter),Cint,(Ptr{AVFilterGraph},Ptr{Void}),graphctx,log_ctx) + ccall((:avfilter_graph_config,libavfilter),Cint,(Ptr{AVFilterGraph},Ptr{Cvoid}),graphctx,log_ctx) end function avfilter_graph_free(graph) - ccall((:avfilter_graph_free,libavfilter),Void,(Ptr{Ptr{AVFilterGraph}},),graph) + ccall((:avfilter_graph_free,libavfilter),Cvoid,(Ptr{Ptr{AVFilterGraph}},),graph) end function avfilter_inout_alloc() @@ -184,15 +184,15 @@ function avfilter_inout_alloc() end function avfilter_inout_free(inout) - ccall((:avfilter_inout_free,libavfilter),Void,(Ptr{Ptr{AVFilterInOut}},),inout) + ccall((:avfilter_inout_free,libavfilter),Cvoid,(Ptr{Ptr{AVFilterInOut}},),inout) end function avfilter_graph_parse(graph,filters,inputs,outputs,log_ctx) - ccall((:avfilter_graph_parse,libavfilter),Cint,(Ptr{AVFilterGraph},Cstring,Ptr{AVFilterInOut},Ptr{AVFilterInOut},Ptr{Void}),graph,filters,inputs,outputs,log_ctx) + ccall((:avfilter_graph_parse,libavfilter),Cint,(Ptr{AVFilterGraph},Cstring,Ptr{AVFilterInOut},Ptr{AVFilterInOut},Ptr{Cvoid}),graph,filters,inputs,outputs,log_ctx) end function avfilter_graph_parse_ptr(graph,filters,inputs,outputs,log_ctx) - ccall((:avfilter_graph_parse_ptr,libavfilter),Cint,(Ptr{AVFilterGraph},Cstring,Ptr{Ptr{AVFilterInOut}},Ptr{Ptr{AVFilterInOut}},Ptr{Void}),graph,filters,inputs,outputs,log_ctx) + ccall((:avfilter_graph_parse_ptr,libavfilter),Cint,(Ptr{AVFilterGraph},Cstring,Ptr{Ptr{AVFilterInOut}},Ptr{Ptr{AVFilterInOut}},Ptr{Cvoid}),graph,filters,inputs,outputs,log_ctx) end function avfilter_graph_parse2(graph,filters,inputs,outputs) diff --git a/src/ffmpeg/AVFilters/v6/buffersink.jl b/src/ffmpeg/AVFilters/v6/buffersink.jl index 1143dd5d..64d01528 100644 --- a/src/ffmpeg/AVFilters/v6/buffersink.jl +++ b/src/ffmpeg/AVFilters/v6/buffersink.jl @@ -25,7 +25,7 @@ function av_abuffersink_params_alloc() end function av_buffersink_set_frame_size(ctx,frame_size::Integer) - ccall((:av_buffersink_set_frame_size,libavfilter),Void,(Ptr{AVFilterContext},UInt32),ctx,frame_size) + ccall((:av_buffersink_set_frame_size,libavfilter),Cvoid,(Ptr{AVFilterContext},UInt32),ctx,frame_size) end function av_buffersink_get_frame_rate(ctx) diff --git a/src/ffmpeg/AVFilters/v6/libavfilter_h.jl b/src/ffmpeg/AVFilters/v6/libavfilter_h.jl index a61ead93..2e15e756 100644 --- a/src/ffmpeg/AVFilters/v6/libavfilter_h.jl +++ b/src/ffmpeg/AVFilters/v6/libavfilter_h.jl @@ -47,7 +47,7 @@ const AVFILTER_THREAD_SLICE = 1 << 0 const AVFILTER_CMD_FLAG_ONE = 1 const AVFILTER_CMD_FLAG_FAST = 2 -const AVFilterPad = Void +const AVFilterPad = Nothing struct AVFilter name::Cstring @@ -56,17 +56,17 @@ struct AVFilter outputs::Ptr{AVFilterPad} priv_class::Ptr{AVClass} flags::Cint - init::Ptr{Void} - init_dict::Ptr{Void} - uninit::Ptr{Void} - query_formats::Ptr{Void} + init::Ptr{Cvoid} + init_dict::Ptr{Cvoid} + uninit::Ptr{Cvoid} + query_formats::Ptr{Cvoid} priv_size::Cint next::Ptr{AVFilter} - process_command::Ptr{Void} - init_opaque::Ptr{Void} + process_command::Ptr{Cvoid} + init_opaque::Ptr{Cvoid} end -const AVFilterGraphInternal = Void +const AVFilterGraphInternal = Nothing struct AVFilterGraph av_class::Ptr{AVClass} @@ -77,7 +77,7 @@ struct AVFilterGraph thread_type::Cint nb_threads::Cint internal::Ptr{AVFilterGraphInternal} - opaque::Ptr{Void} + opaque::Ptr{Cvoid} execute::Ptr{avfilter_execute_func} aresample_swr_opts::Cstring sink_links::Ptr{Ptr{AVFilterLink}} @@ -85,7 +85,7 @@ struct AVFilterGraph disable_auto_convert::UInt32 end -const AVFilterInternal = Void +const AVFilterInternal = Nothing struct AVFilterContext av_class::Ptr{AVClass} @@ -97,18 +97,18 @@ struct AVFilterContext output_pads::Ptr{AVFilterPad} outputs::Ptr{Ptr{AVFilterLink}} nb_outputs::UInt32 - priv::Ptr{Void} + priv::Ptr{Cvoid} graph::Ptr{AVFilterGraph} thread_type::Cint internal::Ptr{AVFilterInternal} command_queue::Ptr{AVFilterCommand} enable_str::Cstring - enable::Ptr{Void} + enable::Ptr{Cvoid} var_values::Ptr{Cdouble} is_disabled::Cint end -const AVFilterFormats = Void +const AVFilterFormats = Nothing # begin enum ANONYMOUS_1 const ANONYMOUS_1 = Cint diff --git a/src/ffmpeg/AVFormat/v53/avformat.jl b/src/ffmpeg/AVFormat/v53/avformat.jl index c0138883..5c887b01 100644 --- a/src/ffmpeg/AVFormat/v53/avformat.jl +++ b/src/ffmpeg/AVFormat/v53/avformat.jl @@ -95,15 +95,15 @@ function av_metadata_set2(pm,key,value,flags::Integer) end function av_metadata_conv(ctx,d_conv,s_conv) - ccall((:av_metadata_conv,libavformat),Void,(Ptr{AVFormatContext},Ptr{AVMetadataConv},Ptr{AVMetadataConv}),ctx,d_conv,s_conv) + ccall((:av_metadata_conv,libavformat),Cvoid,(Ptr{AVFormatContext},Ptr{AVMetadataConv},Ptr{AVMetadataConv}),ctx,d_conv,s_conv) end function av_metadata_copy(dst,src,flags::Integer) - ccall((:av_metadata_copy,libavformat),Void,(Ptr{Ptr{AVDictionary}},Ptr{AVDictionary},Cint),dst,src,flags) + ccall((:av_metadata_copy,libavformat),Cvoid,(Ptr{Ptr{AVDictionary}},Ptr{AVDictionary},Cint),dst,src,flags) end function av_metadata_free(m) - ccall((:av_metadata_free,libavformat),Void,(Ptr{Ptr{AVDictionary}},),m) + ccall((:av_metadata_free,libavformat),Cvoid,(Ptr{Ptr{AVDictionary}},),m) end function av_get_packet(s,pkt,size::Integer) @@ -127,15 +127,15 @@ function avformat_license() end function av_register_all() - ccall((:av_register_all,libavformat),Void,()) + ccall((:av_register_all,libavformat),Cvoid,()) end function av_register_input_format(format) - ccall((:av_register_input_format,libavformat),Void,(Ptr{AVInputFormat},),format) + ccall((:av_register_input_format,libavformat),Cvoid,(Ptr{AVInputFormat},),format) end function av_register_output_format(format) - ccall((:av_register_output_format,libavformat),Void,(Ptr{AVOutputFormat},),format) + ccall((:av_register_output_format,libavformat),Cvoid,(Ptr{AVOutputFormat},),format) end function avformat_network_init() @@ -159,7 +159,7 @@ function avformat_alloc_context() end function avformat_free_context(s) - ccall((:avformat_free_context,libavformat),Void,(Ptr{AVFormatContext},),s) + ccall((:avformat_free_context,libavformat),Cvoid,(Ptr{AVFormatContext},),s) end function avformat_get_class() @@ -179,11 +179,11 @@ function av_guess_image2_codec(filename) end function av_pkt_dump(f,pkt,dump_payload::Integer) - ccall((:av_pkt_dump,libavformat),Void,(Ptr{Void},Ptr{AVPacket},Cint),f,pkt,dump_payload) + ccall((:av_pkt_dump,libavformat),Cvoid,(Ptr{Cvoid},Ptr{AVPacket},Cint),f,pkt,dump_payload) end function av_pkt_dump_log(avcl,level::Integer,pkt,dump_payload::Integer) - ccall((:av_pkt_dump_log,libavformat),Void,(Ptr{Void},Cint,Ptr{AVPacket},Cint),avcl,level,pkt,dump_payload) + ccall((:av_pkt_dump_log,libavformat),Cvoid,(Ptr{Cvoid},Cint,Ptr{AVPacket},Cint),avcl,level,pkt,dump_payload) end function av_find_input_format(short_name) @@ -199,7 +199,7 @@ function av_probe_input_format2(pd,is_opened::Integer,score_max) end function av_probe_input_buffer(pb,fmt,filename,logctx,offset::Integer,max_probe_size::Integer) - ccall((:av_probe_input_buffer,libavformat),Cint,(Ptr{AVIOContext},Ptr{Ptr{AVInputFormat}},Ptr{UInt8},Ptr{Void},UInt32,UInt32),pb,fmt,filename,logctx,offset,max_probe_size) + ccall((:av_probe_input_buffer,libavformat),Cint,(Ptr{AVIOContext},Ptr{Ptr{AVInputFormat}},Ptr{UInt8},Ptr{Cvoid},UInt32,UInt32),pb,fmt,filename,logctx,offset,max_probe_size) end # function av_open_input_stream(ic_ptr,pb,filename,fmt,ap) @@ -251,15 +251,15 @@ function av_read_pause(s) end function av_close_input_stream(s) - ccall((:av_close_input_stream,libavformat),Void,(Ptr{AVFormatContext},),s) + ccall((:av_close_input_stream,libavformat),Cvoid,(Ptr{AVFormatContext},),s) end function av_close_input_file(s) - ccall((:av_close_input_file,libavformat),Void,(Ptr{AVFormatContext},),s) + ccall((:av_close_input_file,libavformat),Cvoid,(Ptr{AVFormatContext},),s) end function avformat_close_input(s) - ccall((:avformat_close_input,libavformat),Void,(Ptr{Ptr{AVFormatContext}},),s) + ccall((:avformat_close_input,libavformat),Cvoid,(Ptr{Ptr{AVFormatContext}},),s) end function av_new_stream(s,id::Integer) @@ -267,7 +267,7 @@ function av_new_stream(s,id::Integer) end function av_set_pts_info(s,pts_wrap_bits::Integer,pts_num::Integer,pts_den::Integer) - ccall((:av_set_pts_info,libavformat),Void,(Ptr{AVStream},Cint,UInt32,UInt32),s,pts_wrap_bits,pts_num,pts_den) + ccall((:av_set_pts_info,libavformat),Cvoid,(Ptr{AVStream},Cint,UInt32,UInt32),s,pts_wrap_bits,pts_num,pts_den) end function av_seek_frame_binary(s,stream_index::Integer,target_ts::Int64,flags::Integer) @@ -275,11 +275,11 @@ function av_seek_frame_binary(s,stream_index::Integer,target_ts::Int64,flags::In end function av_update_cur_dts(s,ref_st,timestamp::Int64) - ccall((:av_update_cur_dts,libavformat),Void,(Ptr{AVFormatContext},Ptr{AVStream},Int64),s,ref_st,timestamp) + ccall((:av_update_cur_dts,libavformat),Cvoid,(Ptr{AVFormatContext},Ptr{AVStream},Int64),s,ref_st,timestamp) end function av_gen_search(s,stream_index::Integer,target_ts::Int64,pos_min::Int64,pos_max::Int64,pos_limit::Int64,ts_min::Int64,ts_max::Int64,flags::Integer,ts_ret,read_timestamp) - ccall((:av_gen_search,libavformat),Int64,(Ptr{AVFormatContext},Cint,Int64,Int64,Int64,Int64,Int64,Int64,Cint,Ptr{Int64},Ptr{Void}),s,stream_index,target_ts,pos_min,pos_max,pos_limit,ts_min,ts_max,flags,ts_ret,read_timestamp) + ccall((:av_gen_search,libavformat),Int64,(Ptr{AVFormatContext},Cint,Int64,Int64,Int64,Int64,Int64,Int64,Cint,Ptr{Int64},Ptr{Cvoid}),s,stream_index,target_ts,pos_min,pos_max,pos_limit,ts_min,ts_max,flags,ts_ret,read_timestamp) end function av_set_parameters(s,ap) @@ -319,19 +319,19 @@ function av_guess_codec(fmt,short_name,filename,mime_type,_type::AVMediaType) end function av_hex_dump(f,buf,size::Integer) - ccall((:av_hex_dump,libavformat),Void,(Ptr{Void},Ptr{UInt8},Cint),f,buf,size) + ccall((:av_hex_dump,libavformat),Cvoid,(Ptr{Cvoid},Ptr{UInt8},Cint),f,buf,size) end function av_hex_dump_log(avcl,level::Integer,buf,size::Integer) - ccall((:av_hex_dump_log,libavformat),Void,(Ptr{Void},Cint,Ptr{UInt8},Cint),avcl,level,buf,size) + ccall((:av_hex_dump_log,libavformat),Cvoid,(Ptr{Cvoid},Cint,Ptr{UInt8},Cint),avcl,level,buf,size) end function av_pkt_dump2(f,pkt,dump_payload::Integer,st) - ccall((:av_pkt_dump2,libavformat),Void,(Ptr{Void},Ptr{AVPacket},Cint,Ptr{AVStream}),f,pkt,dump_payload,st) + ccall((:av_pkt_dump2,libavformat),Cvoid,(Ptr{Cvoid},Ptr{AVPacket},Cint,Ptr{AVStream}),f,pkt,dump_payload,st) end function av_pkt_dump_log2(avcl,level::Integer,pkt,dump_payload::Integer,st) - ccall((:av_pkt_dump_log2,libavformat),Void,(Ptr{Void},Cint,Ptr{AVPacket},Cint,Ptr{AVStream}),avcl,level,pkt,dump_payload,st) + ccall((:av_pkt_dump_log2,libavformat),Cvoid,(Ptr{Cvoid},Cint,Ptr{AVPacket},Cint,Ptr{AVStream}),avcl,level,pkt,dump_payload,st) end function av_codec_get_id(tags,tag::Integer) @@ -355,15 +355,15 @@ function av_add_index_entry(st,pos::Int64,timestamp::Int64,size::Integer,distanc end function av_url_split(proto,proto_size::Integer,authorization,authorization_size::Integer,hostname,hostname_size::Integer,port_ptr,path,path_size::Integer,url) - ccall((:av_url_split,libavformat),Void,(Ptr{UInt8},Cint,Ptr{UInt8},Cint,Ptr{UInt8},Cint,Ptr{Cint},Ptr{UInt8},Cint,Ptr{UInt8}),proto,proto_size,authorization,authorization_size,hostname,hostname_size,port_ptr,path,path_size,url) + ccall((:av_url_split,libavformat),Cvoid,(Ptr{UInt8},Cint,Ptr{UInt8},Cint,Ptr{UInt8},Cint,Ptr{Cint},Ptr{UInt8},Cint,Ptr{UInt8}),proto,proto_size,authorization,authorization_size,hostname,hostname_size,port_ptr,path,path_size,url) end function dump_format(ic,index::Integer,url,is_output::Integer) - ccall((:dump_format,libavformat),Void,(Ptr{AVFormatContext},Cint,Ptr{UInt8},Cint),ic,index,url,is_output) + ccall((:dump_format,libavformat),Cvoid,(Ptr{AVFormatContext},Cint,Ptr{UInt8},Cint),ic,index,url,is_output) end function av_dump_format(ic,index::Integer,url,is_output::Integer) - ccall((:av_dump_format,libavformat),Void,(Ptr{AVFormatContext},Cint,Ptr{UInt8},Cint),ic,index,url,is_output) + ccall((:av_dump_format,libavformat),Cvoid,(Ptr{AVFormatContext},Cint,Ptr{UInt8},Cint),ic,index,url,is_output) end function parse_date(datestr,duration::Integer) diff --git a/src/ffmpeg/AVFormat/v53/avio.jl b/src/ffmpeg/AVFormat/v53/avio.jl index 940df577..fadeb0ea 100644 --- a/src/ffmpeg/AVFormat/v53/avio.jl +++ b/src/ffmpeg/AVFormat/v53/avio.jl @@ -173,7 +173,7 @@ function url_get_max_packet_size(h) end function url_get_filename(h,buf,buf_size::Integer) - ccall((:url_get_filename,libavformat),Void,(Ptr{URLContext},Ptr{UInt8},Cint),h,buf,buf_size) + ccall((:url_get_filename,libavformat),Cvoid,(Ptr{URLContext},Ptr{UInt8},Cint),h,buf,buf_size) end function av_url_read_pause(h,pause::Integer) @@ -185,7 +185,7 @@ function av_url_read_seek(h,stream_index::Integer,timestamp::Int64,flags::Intege end function url_set_interrupt_cb(interrupt_cb) - ccall((:url_set_interrupt_cb,libavformat),Void,(Ptr{Void},),interrupt_cb) + ccall((:url_set_interrupt_cb,libavformat),Cvoid,(Ptr{Cvoid},),interrupt_cb) end function av_protocol_next(p) @@ -197,11 +197,11 @@ function av_register_protocol2(protocol,size::Integer) end function init_put_byte(s,buffer,buffer_size::Integer,write_flag::Integer,opaque,read_packet,write_packet,seek) - ccall((:init_put_byte,libavformat),Cint,(Ptr{AVIOContext},Ptr{Cuchar},Cint,Cint,Ptr{Void},Ptr{Void},Ptr{Void},Ptr{Void}),s,buffer,buffer_size,write_flag,opaque,read_packet,write_packet,seek) + ccall((:init_put_byte,libavformat),Cint,(Ptr{AVIOContext},Ptr{Cuchar},Cint,Cint,Ptr{Cvoid},Ptr{Cvoid},Ptr{Cvoid},Ptr{Cvoid}),s,buffer,buffer_size,write_flag,opaque,read_packet,write_packet,seek) end function av_alloc_put_byte(buffer,buffer_size::Integer,write_flag::Integer,opaque,read_packet,write_packet,seek) - ccall((:av_alloc_put_byte,libavformat),Ptr{AVIOContext},(Ptr{Cuchar},Cint,Cint,Ptr{Void},Ptr{Void},Ptr{Void},Ptr{Void}),buffer,buffer_size,write_flag,opaque,read_packet,write_packet,seek) + ccall((:av_alloc_put_byte,libavformat),Ptr{AVIOContext},(Ptr{Cuchar},Cint,Cint,Ptr{Cvoid},Ptr{Cvoid},Ptr{Cvoid},Ptr{Cvoid}),buffer,buffer_size,write_flag,opaque,read_packet,write_packet,seek) end function get_buffer(s,buf,size::Integer) @@ -249,51 +249,51 @@ function get_be64(s) end function put_byte(s,b::Integer) - ccall((:put_byte,libavformat),Void,(Ptr{AVIOContext},Cint),s,b) + ccall((:put_byte,libavformat),Cvoid,(Ptr{AVIOContext},Cint),s,b) end function put_nbyte(s,b::Integer,count::Integer) - ccall((:put_nbyte,libavformat),Void,(Ptr{AVIOContext},Cint,Cint),s,b,count) + ccall((:put_nbyte,libavformat),Cvoid,(Ptr{AVIOContext},Cint,Cint),s,b,count) end function put_buffer(s,buf,size::Integer) - ccall((:put_buffer,libavformat),Void,(Ptr{AVIOContext},Ptr{Cuchar},Cint),s,buf,size) + ccall((:put_buffer,libavformat),Cvoid,(Ptr{AVIOContext},Ptr{Cuchar},Cint),s,buf,size) end function put_le64(s,val::UInt64) - ccall((:put_le64,libavformat),Void,(Ptr{AVIOContext},UInt64),s,val) + ccall((:put_le64,libavformat),Cvoid,(Ptr{AVIOContext},UInt64),s,val) end function put_be64(s,val::UInt64) - ccall((:put_be64,libavformat),Void,(Ptr{AVIOContext},UInt64),s,val) + ccall((:put_be64,libavformat),Cvoid,(Ptr{AVIOContext},UInt64),s,val) end function put_le32(s,val::Integer) - ccall((:put_le32,libavformat),Void,(Ptr{AVIOContext},UInt32),s,val) + ccall((:put_le32,libavformat),Cvoid,(Ptr{AVIOContext},UInt32),s,val) end function put_be32(s,val::Integer) - ccall((:put_be32,libavformat),Void,(Ptr{AVIOContext},UInt32),s,val) + ccall((:put_be32,libavformat),Cvoid,(Ptr{AVIOContext},UInt32),s,val) end function put_le24(s,val::Integer) - ccall((:put_le24,libavformat),Void,(Ptr{AVIOContext},UInt32),s,val) + ccall((:put_le24,libavformat),Cvoid,(Ptr{AVIOContext},UInt32),s,val) end function put_be24(s,val::Integer) - ccall((:put_be24,libavformat),Void,(Ptr{AVIOContext},UInt32),s,val) + ccall((:put_be24,libavformat),Cvoid,(Ptr{AVIOContext},UInt32),s,val) end function put_le16(s,val::Integer) - ccall((:put_le16,libavformat),Void,(Ptr{AVIOContext},UInt32),s,val) + ccall((:put_le16,libavformat),Cvoid,(Ptr{AVIOContext},UInt32),s,val) end function put_be16(s,val::Integer) - ccall((:put_be16,libavformat),Void,(Ptr{AVIOContext},UInt32),s,val) + ccall((:put_be16,libavformat),Cvoid,(Ptr{AVIOContext},UInt32),s,val) end function put_tag(s,tag) - ccall((:put_tag,libavformat),Void,(Ptr{AVIOContext},Ptr{UInt8}),s,tag) + ccall((:put_tag,libavformat),Cvoid,(Ptr{AVIOContext},Ptr{UInt8}),s,tag) end function av_url_read_fpause(h,pause::Integer) @@ -337,7 +337,7 @@ function url_setbufsize(s,buf_size::Integer) end function put_flush_packet(s) - ccall((:put_flush_packet,libavformat),Void,(Ptr{AVIOContext},),s) + ccall((:put_flush_packet,libavformat),Cvoid,(Ptr{AVIOContext},),s) end function url_open_dyn_buf(s) @@ -373,7 +373,7 @@ function udp_get_local_port(h) end function init_checksum(s,update_checksum,checksum::Culong) - ccall((:init_checksum,libavformat),Void,(Ptr{AVIOContext},Ptr{Void},Culong),s,update_checksum,checksum) + ccall((:init_checksum,libavformat),Cvoid,(Ptr{AVIOContext},Ptr{Cvoid},Culong),s,update_checksum,checksum) end function get_checksum(s) @@ -381,7 +381,7 @@ function get_checksum(s) end function put_strz(s,buf) - ccall((:put_strz,libavformat),Void,(Ptr{AVIOContext},Ptr{UInt8}),s,buf) + ccall((:put_strz,libavformat),Cvoid,(Ptr{AVIOContext},Ptr{UInt8}),s,buf) end function url_fgets(s,buf,buf_size::Integer) @@ -421,51 +421,51 @@ function avio_check(url,flags::Integer) end function avio_set_interrupt_cb(interrupt_cb) - ccall((:avio_set_interrupt_cb,libavformat),Void,(Ptr{Void},),interrupt_cb) + ccall((:avio_set_interrupt_cb,libavformat),Cvoid,(Ptr{Cvoid},),interrupt_cb) end function avio_alloc_context(buffer,buffer_size::Integer,write_flag::Integer,opaque,read_packet,write_packet,seek) - ccall((:avio_alloc_context,libavformat),Ptr{AVIOContext},(Ptr{Cuchar},Cint,Cint,Ptr{Void},Ptr{Void},Ptr{Void},Ptr{Void}),buffer,buffer_size,write_flag,opaque,read_packet,write_packet,seek) + ccall((:avio_alloc_context,libavformat),Ptr{AVIOContext},(Ptr{Cuchar},Cint,Cint,Ptr{Cvoid},Ptr{Cvoid},Ptr{Cvoid},Ptr{Cvoid}),buffer,buffer_size,write_flag,opaque,read_packet,write_packet,seek) end function avio_w8(s,b::Integer) - ccall((:avio_w8,libavformat),Void,(Ptr{AVIOContext},Cint),s,b) + ccall((:avio_w8,libavformat),Cvoid,(Ptr{AVIOContext},Cint),s,b) end function avio_write(s,buf,size::Integer) - ccall((:avio_write,libavformat),Void,(Ptr{AVIOContext},Ptr{Cuchar},Cint),s,buf,size) + ccall((:avio_write,libavformat),Cvoid,(Ptr{AVIOContext},Ptr{Cuchar},Cint),s,buf,size) end function avio_wl64(s,val::UInt64) - ccall((:avio_wl64,libavformat),Void,(Ptr{AVIOContext},UInt64),s,val) + ccall((:avio_wl64,libavformat),Cvoid,(Ptr{AVIOContext},UInt64),s,val) end function avio_wb64(s,val::UInt64) - ccall((:avio_wb64,libavformat),Void,(Ptr{AVIOContext},UInt64),s,val) + ccall((:avio_wb64,libavformat),Cvoid,(Ptr{AVIOContext},UInt64),s,val) end function avio_wl32(s,val::Integer) - ccall((:avio_wl32,libavformat),Void,(Ptr{AVIOContext},UInt32),s,val) + ccall((:avio_wl32,libavformat),Cvoid,(Ptr{AVIOContext},UInt32),s,val) end function avio_wb32(s,val::Integer) - ccall((:avio_wb32,libavformat),Void,(Ptr{AVIOContext},UInt32),s,val) + ccall((:avio_wb32,libavformat),Cvoid,(Ptr{AVIOContext},UInt32),s,val) end function avio_wl24(s,val::Integer) - ccall((:avio_wl24,libavformat),Void,(Ptr{AVIOContext},UInt32),s,val) + ccall((:avio_wl24,libavformat),Cvoid,(Ptr{AVIOContext},UInt32),s,val) end function avio_wb24(s,val::Integer) - ccall((:avio_wb24,libavformat),Void,(Ptr{AVIOContext},UInt32),s,val) + ccall((:avio_wb24,libavformat),Cvoid,(Ptr{AVIOContext},UInt32),s,val) end function avio_wl16(s,val::Integer) - ccall((:avio_wl16,libavformat),Void,(Ptr{AVIOContext},UInt32),s,val) + ccall((:avio_wl16,libavformat),Cvoid,(Ptr{AVIOContext},UInt32),s,val) end function avio_wb16(s,val::Integer) - ccall((:avio_wb16,libavformat),Void,(Ptr{AVIOContext},UInt32),s,val) + ccall((:avio_wb16,libavformat),Cvoid,(Ptr{AVIOContext},UInt32),s,val) end function avio_put_str(s,str) @@ -493,7 +493,7 @@ function avio_size(s) end function avio_flush(s) - ccall((:avio_flush,libavformat),Void,(Ptr{AVIOContext},),s) + ccall((:avio_flush,libavformat),Cvoid,(Ptr{AVIOContext},),s) end function avio_read(s,buf,size::Integer) @@ -569,7 +569,7 @@ function avio_close_dyn_buf(s,pbuffer) end function avio_enum_protocols(opaque,output::Integer) - ccall((:avio_enum_protocols,libavformat),Ptr{UInt8},(Ptr{Ptr{Void}},Cint),opaque,output) + ccall((:avio_enum_protocols,libavformat),Ptr{UInt8},(Ptr{Ptr{Cvoid}},Cint),opaque,output) end function avio_pause(h,pause::Integer) diff --git a/src/ffmpeg/AVFormat/v53/libavformat_h.jl b/src/ffmpeg/AVFormat/v53/libavformat_h.jl index 829585b1..ba6ff4d7 100644 --- a/src/ffmpeg/AVFormat/v53/libavformat_h.jl +++ b/src/ffmpeg/AVFormat/v53/libavformat_h.jl @@ -117,8 +117,8 @@ const AVIO_FLAG_READ_WRITE = AVIO_FLAG_READ | AVIO_FLAG_WRITE const AVIO_FLAG_NONBLOCK = 8 struct AVIOInterruptCB - callback::Ptr{Void} - opaque::Ptr{Void} + callback::Ptr{Cvoid} + opaque::Ptr{Cvoid} end struct AVIOContext @@ -126,10 +126,10 @@ struct AVIOContext buffer_size::Cint buf_ptr::Ptr{Cuchar} buf_end::Ptr{Cuchar} - opaque::Ptr{Void} - read_packet::Ptr{Void} - write_packet::Ptr{Void} - seek::Ptr{Void} + opaque::Ptr{Cvoid} + read_packet::Ptr{Cvoid} + write_packet::Ptr{Cvoid} + seek::Ptr{Cvoid} pos::Int64 must_flush::Cint eof_reached::Cint @@ -138,28 +138,28 @@ struct AVIOContext max_packet_size::Cint checksum::Culong checksum_ptr::Ptr{Cuchar} - update_checksum::Ptr{Void} + update_checksum::Ptr{Cvoid} error::Cint - read_pause::Ptr{Void} - read_seek::Ptr{Void} + read_pause::Ptr{Cvoid} + read_seek::Ptr{Cvoid} seekable::Cint end struct URLProtocol name::Ptr{UInt8} - url_open::Ptr{Void} - url_read::Ptr{Void} - url_write::Ptr{Void} - url_seek::Ptr{Void} - url_close::Ptr{Void} + url_open::Ptr{Cvoid} + url_read::Ptr{Cvoid} + url_write::Ptr{Cvoid} + url_seek::Ptr{Cvoid} + url_close::Ptr{Cvoid} next::Ptr{URLProtocol} - url_read_pause::Ptr{Void} - url_read_seek::Ptr{Void} - url_get_file_handle::Ptr{Void} + url_read_pause::Ptr{Cvoid} + url_read_seek::Ptr{Cvoid} + url_get_file_handle::Ptr{Cvoid} priv_data_size::Cint priv_data_class::Ptr{AVClass} flags::Cint - url_check::Ptr{Void} + url_check::Ptr{Cvoid} end struct URLContext @@ -168,7 +168,7 @@ struct URLContext flags::Cint is_streamed::Cint max_packet_size::Cint - priv_data::Ptr{Void} + priv_data::Ptr{Cvoid} filename::Ptr{UInt8} is_connected::Cint interrupt_callback::AVIOInterruptCB @@ -237,26 +237,26 @@ const AVSEEK_FLAG_BYTE = 2 const AVSEEK_FLAG_ANY = 4 const AVSEEK_FLAG_FRAME = 8 -const AVCodecTag = Void -const AVMetadataConv = Void +const AVCodecTag = Nothing +const AVMetadataConv = Nothing struct AVInputFormat name::Ptr{UInt8} long_name::Ptr{UInt8} priv_data_size::Cint - read_probe::Ptr{Void} - read_header::Ptr{Void} - read_packet::Ptr{Void} - read_close::Ptr{Void} - read_seek::Ptr{Void} - read_timestamp::Ptr{Void} + read_probe::Ptr{Cvoid} + read_header::Ptr{Cvoid} + read_packet::Ptr{Cvoid} + read_close::Ptr{Cvoid} + read_seek::Ptr{Cvoid} + read_timestamp::Ptr{Cvoid} flags::Cint extensions::Ptr{UInt8} value::Cint - read_play::Ptr{Void} - read_pause::Ptr{Void} + read_play::Ptr{Cvoid} + read_pause::Ptr{Cvoid} codec_tag::Ptr{Ptr{AVCodecTag}} - read_seek2::Ptr{Void} + read_seek2::Ptr{Cvoid} metadata_conv::Ptr{AVMetadataConv} priv_class::Ptr{AVClass} next::Ptr{AVInputFormat} @@ -270,17 +270,17 @@ struct AVOutputFormat priv_data_size::Cint audio_codec::CodecID video_codec::CodecID - write_header::Ptr{Void} - write_packet::Ptr{Void} - write_trailer::Ptr{Void} + write_header::Ptr{Cvoid} + write_packet::Ptr{Cvoid} + write_trailer::Ptr{Cvoid} flags::Cint - set_parameters::Ptr{Void} - interleave_packet::Ptr{Void} + set_parameters::Ptr{Cvoid} + interleave_packet::Ptr{Cvoid} codec_tag::Ptr{Ptr{AVCodecTag}} subtitle_codec::CodecID metadata_conv::Ptr{AVMetadataConv} priv_class::Ptr{AVClass} - query_codec::Ptr{Void} + query_codec::Ptr{Cvoid} next::Ptr{AVOutputFormat} end @@ -345,7 +345,7 @@ struct AVStream id::Cint codec::Ptr{AVCodecContext} r_frame_rate::AVRational - priv_data::Ptr{Void} + priv_data::Ptr{Cvoid} first_dts::Int64 pts::AVFrac time_base::AVRational @@ -377,7 +377,7 @@ struct AVStream last_in_packet_buffer::Ptr{AVPacketList} avg_frame_rate::AVRational codec_info_nb_frames::Cint - info::Ptr{Void} + info::Ptr{Cvoid} end struct Array_1024_Uint8 @@ -1430,7 +1430,7 @@ struct AVFormatContext av_class::Ptr{AVClass} iformat::Ptr{AVInputFormat} oformat::Ptr{AVOutputFormat} - priv_data::Ptr{Void} + priv_data::Ptr{Cvoid} pb::Ptr{AVIOContext} nb_streams::UInt32 streams::Ptr{Ptr{AVStream}} diff --git a/src/ffmpeg/AVFormat/v54/avformat.jl b/src/ffmpeg/AVFormat/v54/avformat.jl index 87f11f5d..23f6a14a 100644 --- a/src/ffmpeg/AVFormat/v54/avformat.jl +++ b/src/ffmpeg/AVFormat/v54/avformat.jl @@ -114,7 +114,7 @@ function av_stream_get_r_frame_rate(s) end function av_stream_set_r_frame_rate(s,r::AVRational) - ccall((:av_stream_set_r_frame_rate,libavformat),Void,(Ptr{AVStream},AVRational),s,r) + ccall((:av_stream_set_r_frame_rate,libavformat),Cvoid,(Ptr{AVStream},AVRational),s,r) end function av_stream_get_parser(s) @@ -134,7 +134,7 @@ function av_format_get_video_codec(s) end function av_format_set_video_codec(s,c) - ccall((:av_format_set_video_codec,libavformat),Void,(Ptr{AVFormatContext},Ptr{AVCodec}),s,c) + ccall((:av_format_set_video_codec,libavformat),Cvoid,(Ptr{AVFormatContext},Ptr{AVCodec}),s,c) end function av_format_get_audio_codec(s) @@ -142,7 +142,7 @@ function av_format_get_audio_codec(s) end function av_format_set_audio_codec(s,c) - ccall((:av_format_set_audio_codec,libavformat),Void,(Ptr{AVFormatContext},Ptr{AVCodec}),s,c) + ccall((:av_format_set_audio_codec,libavformat),Cvoid,(Ptr{AVFormatContext},Ptr{AVCodec}),s,c) end function av_format_get_subtitle_codec(s) @@ -150,7 +150,7 @@ function av_format_get_subtitle_codec(s) end function av_format_set_subtitle_codec(s,c) - ccall((:av_format_set_subtitle_codec,libavformat),Void,(Ptr{AVFormatContext},Ptr{AVCodec}),s,c) + ccall((:av_format_set_subtitle_codec,libavformat),Cvoid,(Ptr{AVFormatContext},Ptr{AVCodec}),s,c) end function av_format_get_metadata_header_padding(s) @@ -158,15 +158,15 @@ function av_format_get_metadata_header_padding(s) end function av_format_set_metadata_header_padding(s,c::Integer) - ccall((:av_format_set_metadata_header_padding,libavformat),Void,(Ptr{AVFormatContext},Cint),s,c) + ccall((:av_format_set_metadata_header_padding,libavformat),Cvoid,(Ptr{AVFormatContext},Cint),s,c) end function av_format_get_opaque(s) - ccall((:av_format_get_opaque,libavformat),Ptr{Void},(Ptr{AVFormatContext},),s) + ccall((:av_format_get_opaque,libavformat),Ptr{Cvoid},(Ptr{AVFormatContext},),s) end function av_format_set_opaque(s,opaque) - ccall((:av_format_set_opaque,libavformat),Void,(Ptr{AVFormatContext},Ptr{Void}),s,opaque) + ccall((:av_format_set_opaque,libavformat),Cvoid,(Ptr{AVFormatContext},Ptr{Cvoid}),s,opaque) end function av_format_get_control_message_cb(s) @@ -174,11 +174,11 @@ function av_format_get_control_message_cb(s) end function av_format_set_control_message_cb(s,callback::av_format_control_message) - ccall((:av_format_set_control_message_cb,libavformat),Void,(Ptr{AVFormatContext},av_format_control_message),s,callback) + ccall((:av_format_set_control_message_cb,libavformat),Cvoid,(Ptr{AVFormatContext},av_format_control_message),s,callback) end function av_format_inject_global_side_data(s) - ccall((:av_format_inject_global_side_data,libavformat),Void,(Ptr{AVFormatContext},),s) + ccall((:av_format_inject_global_side_data,libavformat),Cvoid,(Ptr{AVFormatContext},),s) end function av_fmt_ctx_get_duration_estimation_method(ctx) @@ -198,15 +198,15 @@ function avformat_license() end function av_register_all() - ccall((:av_register_all,libavformat),Void,()) + ccall((:av_register_all,libavformat),Cvoid,()) end function av_register_input_format(format) - ccall((:av_register_input_format,libavformat),Void,(Ptr{AVInputFormat},),format) + ccall((:av_register_input_format,libavformat),Cvoid,(Ptr{AVInputFormat},),format) end function av_register_output_format(format) - ccall((:av_register_output_format,libavformat),Void,(Ptr{AVOutputFormat},),format) + ccall((:av_register_output_format,libavformat),Cvoid,(Ptr{AVOutputFormat},),format) end function avformat_network_init() @@ -230,7 +230,7 @@ function avformat_alloc_context() end function avformat_free_context(s) - ccall((:avformat_free_context,libavformat),Void,(Ptr{AVFormatContext},),s) + ccall((:avformat_free_context,libavformat),Cvoid,(Ptr{AVFormatContext},),s) end function avformat_get_class() @@ -274,11 +274,11 @@ function av_probe_input_format3(pd,is_opened::Integer,score_ret) end function av_probe_input_buffer2(pb,fmt,filename,logctx,offset::Integer,max_probe_size::Integer) - ccall((:av_probe_input_buffer2,libavformat),Cint,(Ptr{AVIOContext},Ptr{Ptr{AVInputFormat}},Ptr{UInt8},Ptr{Void},UInt32,UInt32),pb,fmt,filename,logctx,offset,max_probe_size) + ccall((:av_probe_input_buffer2,libavformat),Cint,(Ptr{AVIOContext},Ptr{Ptr{AVInputFormat}},Ptr{UInt8},Ptr{Cvoid},UInt32,UInt32),pb,fmt,filename,logctx,offset,max_probe_size) end function av_probe_input_buffer(pb,fmt,filename,logctx,offset::Integer,max_probe_size::Integer) - ccall((:av_probe_input_buffer,libavformat),Cint,(Ptr{AVIOContext},Ptr{Ptr{AVInputFormat}},Ptr{UInt8},Ptr{Void},UInt32,UInt32),pb,fmt,filename,logctx,offset,max_probe_size) + ccall((:av_probe_input_buffer,libavformat),Cint,(Ptr{AVIOContext},Ptr{Ptr{AVInputFormat}},Ptr{UInt8},Ptr{Cvoid},UInt32,UInt32),pb,fmt,filename,logctx,offset,max_probe_size) end function avformat_open_input(ps,filename,fmt,options) @@ -330,11 +330,11 @@ function av_read_pause(s) end function av_close_input_file(s) - ccall((:av_close_input_file,libavformat),Void,(Ptr{AVFormatContext},),s) + ccall((:av_close_input_file,libavformat),Cvoid,(Ptr{AVFormatContext},),s) end function avformat_close_input(s) - ccall((:avformat_close_input,libavformat),Void,(Ptr{Ptr{AVFormatContext}},),s) + ccall((:avformat_close_input,libavformat),Cvoid,(Ptr{Ptr{AVFormatContext}},),s) end function av_new_stream(s,id::Integer) @@ -342,7 +342,7 @@ function av_new_stream(s,id::Integer) end function av_set_pts_info(s,pts_wrap_bits::Integer,pts_num::Integer,pts_den::Integer) - ccall((:av_set_pts_info,libavformat),Void,(Ptr{AVStream},Cint,UInt32,UInt32),s,pts_wrap_bits,pts_num,pts_den) + ccall((:av_set_pts_info,libavformat),Cvoid,(Ptr{AVStream},Cint,UInt32,UInt32),s,pts_wrap_bits,pts_num,pts_den) end function avformat_write_header(s,options) @@ -386,19 +386,19 @@ function av_get_output_timestamp(s,stream::Integer,dts,wall) end function av_hex_dump(f,buf,size::Integer) - ccall((:av_hex_dump,libavformat),Void,(Ptr{Void},Ptr{UInt8},Cint),f,buf,size) + ccall((:av_hex_dump,libavformat),Cvoid,(Ptr{Cvoid},Ptr{UInt8},Cint),f,buf,size) end function av_hex_dump_log(avcl,level::Integer,buf,size::Integer) - ccall((:av_hex_dump_log,libavformat),Void,(Ptr{Void},Cint,Ptr{UInt8},Cint),avcl,level,buf,size) + ccall((:av_hex_dump_log,libavformat),Cvoid,(Ptr{Cvoid},Cint,Ptr{UInt8},Cint),avcl,level,buf,size) end function av_pkt_dump2(f,pkt,dump_payload::Integer,st) - ccall((:av_pkt_dump2,libavformat),Void,(Ptr{Void},Ptr{AVPacket},Cint,Ptr{AVStream}),f,pkt,dump_payload,st) + ccall((:av_pkt_dump2,libavformat),Cvoid,(Ptr{Cvoid},Ptr{AVPacket},Cint,Ptr{AVStream}),f,pkt,dump_payload,st) end function av_pkt_dump_log2(avcl,level::Integer,pkt,dump_payload::Integer,st) - ccall((:av_pkt_dump_log2,libavformat),Void,(Ptr{Void},Cint,Ptr{AVPacket},Cint,Ptr{AVStream}),avcl,level,pkt,dump_payload,st) + ccall((:av_pkt_dump_log2,libavformat),Cvoid,(Ptr{Cvoid},Cint,Ptr{AVPacket},Cint,Ptr{AVStream}),avcl,level,pkt,dump_payload,st) end function av_codec_get_id(tags,tag::Integer) @@ -426,11 +426,11 @@ function av_add_index_entry(st,pos::Int64,timestamp::Int64,size::Integer,distanc end function av_url_split(proto,proto_size::Integer,authorization,authorization_size::Integer,hostname,hostname_size::Integer,port_ptr,path,path_size::Integer,url) - ccall((:av_url_split,libavformat),Void,(Ptr{UInt8},Cint,Ptr{UInt8},Cint,Ptr{UInt8},Cint,Ptr{Cint},Ptr{UInt8},Cint,Ptr{UInt8}),proto,proto_size,authorization,authorization_size,hostname,hostname_size,port_ptr,path,path_size,url) + ccall((:av_url_split,libavformat),Cvoid,(Ptr{UInt8},Cint,Ptr{UInt8},Cint,Ptr{UInt8},Cint,Ptr{Cint},Ptr{UInt8},Cint,Ptr{UInt8}),proto,proto_size,authorization,authorization_size,hostname,hostname_size,port_ptr,path,path_size,url) end function av_dump_format(ic,index::Integer,url,is_output::Integer) - ccall((:av_dump_format,libavformat),Void,(Ptr{AVFormatContext},Cint,Ptr{UInt8},Cint),ic,index,url,is_output) + ccall((:av_dump_format,libavformat),Cvoid,(Ptr{AVFormatContext},Cint,Ptr{UInt8},Cint),ic,index,url,is_output) end function av_get_frame_filename(buf,buf_size::Integer,path,number::Integer) diff --git a/src/ffmpeg/AVFormat/v54/avio.jl b/src/ffmpeg/AVFormat/v54/avio.jl index 93bd7832..ebcb3e77 100644 --- a/src/ffmpeg/AVFormat/v54/avio.jl +++ b/src/ffmpeg/AVFormat/v54/avio.jl @@ -57,47 +57,47 @@ function avio_check(url,flags::Integer) end function avio_alloc_context(buffer,buffer_size::Integer,write_flag::Integer,opaque,read_packet,write_packet,seek) - ccall((:avio_alloc_context,libavformat),Ptr{AVIOContext},(Ptr{Cuchar},Cint,Cint,Ptr{Void},Ptr{Void},Ptr{Void},Ptr{Void}),buffer,buffer_size,write_flag,opaque,read_packet,write_packet,seek) + ccall((:avio_alloc_context,libavformat),Ptr{AVIOContext},(Ptr{Cuchar},Cint,Cint,Ptr{Cvoid},Ptr{Cvoid},Ptr{Cvoid},Ptr{Cvoid}),buffer,buffer_size,write_flag,opaque,read_packet,write_packet,seek) end function avio_w8(s,b::Integer) - ccall((:avio_w8,libavformat),Void,(Ptr{AVIOContext},Cint),s,b) + ccall((:avio_w8,libavformat),Cvoid,(Ptr{AVIOContext},Cint),s,b) end function avio_write(s,buf,size::Integer) - ccall((:avio_write,libavformat),Void,(Ptr{AVIOContext},Ptr{Cuchar},Cint),s,buf,size) + ccall((:avio_write,libavformat),Cvoid,(Ptr{AVIOContext},Ptr{Cuchar},Cint),s,buf,size) end function avio_wl64(s,val::UInt64) - ccall((:avio_wl64,libavformat),Void,(Ptr{AVIOContext},UInt64),s,val) + ccall((:avio_wl64,libavformat),Cvoid,(Ptr{AVIOContext},UInt64),s,val) end function avio_wb64(s,val::UInt64) - ccall((:avio_wb64,libavformat),Void,(Ptr{AVIOContext},UInt64),s,val) + ccall((:avio_wb64,libavformat),Cvoid,(Ptr{AVIOContext},UInt64),s,val) end function avio_wl32(s,val::Integer) - ccall((:avio_wl32,libavformat),Void,(Ptr{AVIOContext},UInt32),s,val) + ccall((:avio_wl32,libavformat),Cvoid,(Ptr{AVIOContext},UInt32),s,val) end function avio_wb32(s,val::Integer) - ccall((:avio_wb32,libavformat),Void,(Ptr{AVIOContext},UInt32),s,val) + ccall((:avio_wb32,libavformat),Cvoid,(Ptr{AVIOContext},UInt32),s,val) end function avio_wl24(s,val::Integer) - ccall((:avio_wl24,libavformat),Void,(Ptr{AVIOContext},UInt32),s,val) + ccall((:avio_wl24,libavformat),Cvoid,(Ptr{AVIOContext},UInt32),s,val) end function avio_wb24(s,val::Integer) - ccall((:avio_wb24,libavformat),Void,(Ptr{AVIOContext},UInt32),s,val) + ccall((:avio_wb24,libavformat),Cvoid,(Ptr{AVIOContext},UInt32),s,val) end function avio_wl16(s,val::Integer) - ccall((:avio_wl16,libavformat),Void,(Ptr{AVIOContext},UInt32),s,val) + ccall((:avio_wl16,libavformat),Cvoid,(Ptr{AVIOContext},UInt32),s,val) end function avio_wb16(s,val::Integer) - ccall((:avio_wb16,libavformat),Void,(Ptr{AVIOContext},UInt32),s,val) + ccall((:avio_wb16,libavformat),Cvoid,(Ptr{AVIOContext},UInt32),s,val) end function avio_put_str(s,str) @@ -129,7 +129,7 @@ function url_feof(s) end function avio_flush(s) - ccall((:avio_flush,libavformat),Void,(Ptr{AVIOContext},),s) + ccall((:avio_flush,libavformat),Cvoid,(Ptr{AVIOContext},),s) end function avio_read(s,buf,size::Integer) @@ -209,7 +209,7 @@ function avio_close_dyn_buf(s,pbuffer) end function avio_enum_protocols(opaque,output::Integer) - ccall((:avio_enum_protocols,libavformat),Ptr{UInt8},(Ptr{Ptr{Void}},Cint),opaque,output) + ccall((:avio_enum_protocols,libavformat),Ptr{UInt8},(Ptr{Ptr{Cvoid}},Cint),opaque,output) end function avio_pause(h,pause::Integer) diff --git a/src/ffmpeg/AVFormat/v54/libavformat_h.jl b/src/ffmpeg/AVFormat/v54/libavformat_h.jl index 362e5672..12182d06 100644 --- a/src/ffmpeg/AVFormat/v54/libavformat_h.jl +++ b/src/ffmpeg/AVFormat/v54/libavformat_h.jl @@ -120,8 +120,8 @@ const AVIO_FLAG_NONBLOCK = 8 const AVIO_FLAG_DIRECT = 0x8000 struct AVIOInterruptCB - callback::Ptr{Void} - opaque::Ptr{Void} + callback::Ptr{Cvoid} + opaque::Ptr{Cvoid} end struct AVIOContext @@ -130,10 +130,10 @@ struct AVIOContext buffer_size::Cint buf_ptr::Ptr{Cuchar} buf_end::Ptr{Cuchar} - opaque::Ptr{Void} - read_packet::Ptr{Void} - write_packet::Ptr{Void} - seek::Ptr{Void} + opaque::Ptr{Cvoid} + read_packet::Ptr{Cvoid} + write_packet::Ptr{Cvoid} + seek::Ptr{Cvoid} pos::Int64 must_flush::Cint eof_reached::Cint @@ -141,10 +141,10 @@ struct AVIOContext max_packet_size::Cint checksum::Culong checksum_ptr::Ptr{Cuchar} - update_checksum::Ptr{Void} + update_checksum::Ptr{Cvoid} error::Cint - read_pause::Ptr{Void} - read_seek::Ptr{Void} + read_pause::Ptr{Cvoid} + read_seek::Ptr{Cvoid} seekable::Cint maxsize::Int64 direct::Cint @@ -222,7 +222,7 @@ const AVSEEK_FLAG_BYTE = 2 const AVSEEK_FLAG_ANY = 4 const AVSEEK_FLAG_FRAME = 8 -const AVCodecTag = Void +const AVCodecTag = Nothing struct AVInputFormat name::Ptr{UInt8} @@ -234,18 +234,18 @@ struct AVInputFormat next::Ptr{AVInputFormat} raw_codec_id::Cint priv_data_size::Cint - read_probe::Ptr{Void} - read_header::Ptr{Void} - read_packet::Ptr{Void} - read_close::Ptr{Void} - read_seek::Ptr{Void} - read_timestamp::Ptr{Void} - read_play::Ptr{Void} - read_pause::Ptr{Void} - read_seek2::Ptr{Void} - get_device_list::Ptr{Void} - create_device_capabilities::Ptr{Void} - free_device_capabilities::Ptr{Void} + read_probe::Ptr{Cvoid} + read_header::Ptr{Cvoid} + read_packet::Ptr{Cvoid} + read_close::Ptr{Cvoid} + read_seek::Ptr{Cvoid} + read_timestamp::Ptr{Cvoid} + read_play::Ptr{Cvoid} + read_pause::Ptr{Cvoid} + read_seek2::Ptr{Cvoid} + get_device_list::Ptr{Cvoid} + create_device_capabilities::Ptr{Cvoid} + free_device_capabilities::Ptr{Cvoid} end struct AVOutputFormat @@ -261,17 +261,17 @@ struct AVOutputFormat priv_class::Ptr{AVClass} next::Ptr{AVOutputFormat} priv_data_size::Cint - write_header::Ptr{Void} - write_packet::Ptr{Void} - write_trailer::Ptr{Void} - interleave_packet::Ptr{Void} - query_codec::Ptr{Void} - get_output_timestamp::Ptr{Void} - control_message::Ptr{Void} - write_uncoded_frame::Ptr{Void} - get_device_list::Ptr{Void} - create_device_capabilities::Ptr{Void} - free_device_capabilities::Ptr{Void} + write_header::Ptr{Cvoid} + write_packet::Ptr{Cvoid} + write_trailer::Ptr{Cvoid} + interleave_packet::Ptr{Cvoid} + query_codec::Ptr{Cvoid} + get_output_timestamp::Ptr{Cvoid} + control_message::Ptr{Cvoid} + write_uncoded_frame::Ptr{Cvoid} + get_device_list::Ptr{Cvoid} + create_device_capabilities::Ptr{Cvoid} + free_device_capabilities::Ptr{Cvoid} end struct AVFrac @@ -357,7 +357,7 @@ struct AVStream index::Cint id::Cint codec::Ptr{AVCodecContext} - priv_data::Ptr{Void} + priv_data::Ptr{Cvoid} pts::AVFrac time_base::AVRational start_time::Int64 @@ -371,7 +371,7 @@ struct AVStream attached_pic::AVPacket side_data::Ptr{AVPacketSideData} nb_side_data::Cint - info::Ptr{Void} + info::Ptr{Cvoid} pts_wrap_bits::Cint do_not_use::Int64 first_dts::Int64 @@ -1468,14 +1468,14 @@ const AVFMT_DURATION_FROM_STREAM = UInt32(1) const AVFMT_DURATION_FROM_BITRATE = UInt32(2) # end enum AVDurationEstimationMethod -const AVFormatInternal = Void -const av_format_control_message = Ptr{Void} +const AVFormatInternal = Nothing +const av_format_control_message = Ptr{Cvoid} struct AVFormatContext av_class::Ptr{AVClass} iformat::Ptr{AVInputFormat} oformat::Ptr{AVOutputFormat} - priv_data::Ptr{Void} + priv_data::Ptr{Cvoid} pb::Ptr{AVIOContext} ctx_flags::Cint nb_streams::UInt32 @@ -1538,11 +1538,11 @@ struct AVFormatContext audio_codec::Ptr{AVCodec} subtitle_codec::Ptr{AVCodec} metadata_header_padding::Cint - opaque::Ptr{Void} + opaque::Ptr{Cvoid} control_message_cb::av_format_control_message output_ts_offset::Int64 max_analyze_duration2::Int64 end -const AVDeviceInfoList = Void -const AVDeviceCapabilitiesQuery = Void +const AVDeviceInfoList = Nothing +const AVDeviceCapabilitiesQuery = Nothing diff --git a/src/ffmpeg/AVFormat/v55/avformat.jl b/src/ffmpeg/AVFormat/v55/avformat.jl index 1696394d..10b6773d 100644 --- a/src/ffmpeg/AVFormat/v55/avformat.jl +++ b/src/ffmpeg/AVFormat/v55/avformat.jl @@ -114,7 +114,7 @@ function av_stream_get_r_frame_rate(s) end function av_stream_set_r_frame_rate(s,r::AVRational) - ccall((:av_stream_set_r_frame_rate,libavformat),Void,(Ptr{AVStream},AVRational),s,r) + ccall((:av_stream_set_r_frame_rate,libavformat),Cvoid,(Ptr{AVStream},AVRational),s,r) end function av_stream_get_parser(s) @@ -134,7 +134,7 @@ function av_format_get_video_codec(s) end function av_format_set_video_codec(s,c) - ccall((:av_format_set_video_codec,libavformat),Void,(Ptr{AVFormatContext},Ptr{AVCodec}),s,c) + ccall((:av_format_set_video_codec,libavformat),Cvoid,(Ptr{AVFormatContext},Ptr{AVCodec}),s,c) end function av_format_get_audio_codec(s) @@ -142,7 +142,7 @@ function av_format_get_audio_codec(s) end function av_format_set_audio_codec(s,c) - ccall((:av_format_set_audio_codec,libavformat),Void,(Ptr{AVFormatContext},Ptr{AVCodec}),s,c) + ccall((:av_format_set_audio_codec,libavformat),Cvoid,(Ptr{AVFormatContext},Ptr{AVCodec}),s,c) end function av_format_get_subtitle_codec(s) @@ -150,7 +150,7 @@ function av_format_get_subtitle_codec(s) end function av_format_set_subtitle_codec(s,c) - ccall((:av_format_set_subtitle_codec,libavformat),Void,(Ptr{AVFormatContext},Ptr{AVCodec}),s,c) + ccall((:av_format_set_subtitle_codec,libavformat),Cvoid,(Ptr{AVFormatContext},Ptr{AVCodec}),s,c) end function av_format_get_metadata_header_padding(s) @@ -158,15 +158,15 @@ function av_format_get_metadata_header_padding(s) end function av_format_set_metadata_header_padding(s,c::Integer) - ccall((:av_format_set_metadata_header_padding,libavformat),Void,(Ptr{AVFormatContext},Cint),s,c) + ccall((:av_format_set_metadata_header_padding,libavformat),Cvoid,(Ptr{AVFormatContext},Cint),s,c) end function av_format_get_opaque(s) - ccall((:av_format_get_opaque,libavformat),Ptr{Void},(Ptr{AVFormatContext},),s) + ccall((:av_format_get_opaque,libavformat),Ptr{Cvoid},(Ptr{AVFormatContext},),s) end function av_format_set_opaque(s,opaque) - ccall((:av_format_set_opaque,libavformat),Void,(Ptr{AVFormatContext},Ptr{Void}),s,opaque) + ccall((:av_format_set_opaque,libavformat),Cvoid,(Ptr{AVFormatContext},Ptr{Cvoid}),s,opaque) end function av_format_get_control_message_cb(s) @@ -174,11 +174,11 @@ function av_format_get_control_message_cb(s) end function av_format_set_control_message_cb(s,callback::av_format_control_message) - ccall((:av_format_set_control_message_cb,libavformat),Void,(Ptr{AVFormatContext},av_format_control_message),s,callback) + ccall((:av_format_set_control_message_cb,libavformat),Cvoid,(Ptr{AVFormatContext},av_format_control_message),s,callback) end function av_format_inject_global_side_data(s) - ccall((:av_format_inject_global_side_data,libavformat),Void,(Ptr{AVFormatContext},),s) + ccall((:av_format_inject_global_side_data,libavformat),Cvoid,(Ptr{AVFormatContext},),s) end function av_fmt_ctx_get_duration_estimation_method(ctx) @@ -198,15 +198,15 @@ function avformat_license() end function av_register_all() - ccall((:av_register_all,libavformat),Void,()) + ccall((:av_register_all,libavformat),Cvoid,()) end function av_register_input_format(format) - ccall((:av_register_input_format,libavformat),Void,(Ptr{AVInputFormat},),format) + ccall((:av_register_input_format,libavformat),Cvoid,(Ptr{AVInputFormat},),format) end function av_register_output_format(format) - ccall((:av_register_output_format,libavformat),Void,(Ptr{AVOutputFormat},),format) + ccall((:av_register_output_format,libavformat),Cvoid,(Ptr{AVOutputFormat},),format) end function avformat_network_init() @@ -230,7 +230,7 @@ function avformat_alloc_context() end function avformat_free_context(s) - ccall((:avformat_free_context,libavformat),Void,(Ptr{AVFormatContext},),s) + ccall((:avformat_free_context,libavformat),Cvoid,(Ptr{AVFormatContext},),s) end function avformat_get_class() @@ -274,11 +274,11 @@ function av_probe_input_format3(pd,is_opened::Integer,score_ret) end function av_probe_input_buffer2(pb,fmt,filename,logctx,offset::Integer,max_probe_size::Integer) - ccall((:av_probe_input_buffer2,libavformat),Cint,(Ptr{AVIOContext},Ptr{Ptr{AVInputFormat}},Ptr{UInt8},Ptr{Void},UInt32,UInt32),pb,fmt,filename,logctx,offset,max_probe_size) + ccall((:av_probe_input_buffer2,libavformat),Cint,(Ptr{AVIOContext},Ptr{Ptr{AVInputFormat}},Ptr{UInt8},Ptr{Cvoid},UInt32,UInt32),pb,fmt,filename,logctx,offset,max_probe_size) end function av_probe_input_buffer(pb,fmt,filename,logctx,offset::Integer,max_probe_size::Integer) - ccall((:av_probe_input_buffer,libavformat),Cint,(Ptr{AVIOContext},Ptr{Ptr{AVInputFormat}},Ptr{UInt8},Ptr{Void},UInt32,UInt32),pb,fmt,filename,logctx,offset,max_probe_size) + ccall((:av_probe_input_buffer,libavformat),Cint,(Ptr{AVIOContext},Ptr{Ptr{AVInputFormat}},Ptr{UInt8},Ptr{Cvoid},UInt32,UInt32),pb,fmt,filename,logctx,offset,max_probe_size) end function avformat_open_input(ps,filename,fmt,options) @@ -331,11 +331,11 @@ function av_read_pause(s) end function av_close_input_file(s) - ccall((:av_close_input_file,libavformat),Void,(Ptr{AVFormatContext},),s) + ccall((:av_close_input_file,libavformat),Cvoid,(Ptr{AVFormatContext},),s) end function avformat_close_input(s) - ccall((:avformat_close_input,libavformat),Void,(Ptr{Ptr{AVFormatContext}},),s) + ccall((:avformat_close_input,libavformat),Cvoid,(Ptr{Ptr{AVFormatContext}},),s) end function av_new_stream(s,id::Integer) @@ -343,7 +343,7 @@ function av_new_stream(s,id::Integer) end function av_set_pts_info(s,pts_wrap_bits::Integer,pts_num::Integer,pts_den::Integer) - ccall((:av_set_pts_info,libavformat),Void,(Ptr{AVStream},Cint,UInt32,UInt32),s,pts_wrap_bits,pts_num,pts_den) + ccall((:av_set_pts_info,libavformat),Cvoid,(Ptr{AVStream},Cint,UInt32,UInt32),s,pts_wrap_bits,pts_num,pts_den) end function avformat_write_header(s,options) @@ -387,19 +387,19 @@ function av_get_output_timestamp(s,stream::Integer,dts,wall) end function av_hex_dump(f,buf,size::Integer) - ccall((:av_hex_dump,libavformat),Void,(Ptr{Void},Ptr{UInt8},Cint),f,buf,size) + ccall((:av_hex_dump,libavformat),Cvoid,(Ptr{Cvoid},Ptr{UInt8},Cint),f,buf,size) end function av_hex_dump_log(avcl,level::Integer,buf,size::Integer) - ccall((:av_hex_dump_log,libavformat),Void,(Ptr{Void},Cint,Ptr{UInt8},Cint),avcl,level,buf,size) + ccall((:av_hex_dump_log,libavformat),Cvoid,(Ptr{Cvoid},Cint,Ptr{UInt8},Cint),avcl,level,buf,size) end function av_pkt_dump2(f,pkt,dump_payload::Integer,st) - ccall((:av_pkt_dump2,libavformat),Void,(Ptr{Void},Ptr{AVPacket},Cint,Ptr{AVStream}),f,pkt,dump_payload,st) + ccall((:av_pkt_dump2,libavformat),Cvoid,(Ptr{Cvoid},Ptr{AVPacket},Cint,Ptr{AVStream}),f,pkt,dump_payload,st) end function av_pkt_dump_log2(avcl,level::Integer,pkt,dump_payload::Integer,st) - ccall((:av_pkt_dump_log2,libavformat),Void,(Ptr{Void},Cint,Ptr{AVPacket},Cint,Ptr{AVStream}),avcl,level,pkt,dump_payload,st) + ccall((:av_pkt_dump_log2,libavformat),Cvoid,(Ptr{Cvoid},Cint,Ptr{AVPacket},Cint,Ptr{AVStream}),avcl,level,pkt,dump_payload,st) end function av_codec_get_id(tags,tag::Integer) @@ -427,11 +427,11 @@ function av_add_index_entry(st,pos::Int64,timestamp::Int64,size::Integer,distanc end function av_url_split(proto,proto_size::Integer,authorization,authorization_size::Integer,hostname,hostname_size::Integer,port_ptr,path,path_size::Integer,url) - ccall((:av_url_split,libavformat),Void,(Ptr{UInt8},Cint,Ptr{UInt8},Cint,Ptr{UInt8},Cint,Ptr{Cint},Ptr{UInt8},Cint,Ptr{UInt8}),proto,proto_size,authorization,authorization_size,hostname,hostname_size,port_ptr,path,path_size,url) + ccall((:av_url_split,libavformat),Cvoid,(Ptr{UInt8},Cint,Ptr{UInt8},Cint,Ptr{UInt8},Cint,Ptr{Cint},Ptr{UInt8},Cint,Ptr{UInt8}),proto,proto_size,authorization,authorization_size,hostname,hostname_size,port_ptr,path,path_size,url) end function av_dump_format(ic,index::Integer,url,is_output::Integer) - ccall((:av_dump_format,libavformat),Void,(Ptr{AVFormatContext},Cint,Ptr{UInt8},Cint),ic,index,url,is_output) + ccall((:av_dump_format,libavformat),Cvoid,(Ptr{AVFormatContext},Cint,Ptr{UInt8},Cint),ic,index,url,is_output) end function av_get_frame_filename(buf,buf_size::Integer,path,number::Integer) diff --git a/src/ffmpeg/AVFormat/v55/avio.jl b/src/ffmpeg/AVFormat/v55/avio.jl index 93bd7832..ebcb3e77 100644 --- a/src/ffmpeg/AVFormat/v55/avio.jl +++ b/src/ffmpeg/AVFormat/v55/avio.jl @@ -57,47 +57,47 @@ function avio_check(url,flags::Integer) end function avio_alloc_context(buffer,buffer_size::Integer,write_flag::Integer,opaque,read_packet,write_packet,seek) - ccall((:avio_alloc_context,libavformat),Ptr{AVIOContext},(Ptr{Cuchar},Cint,Cint,Ptr{Void},Ptr{Void},Ptr{Void},Ptr{Void}),buffer,buffer_size,write_flag,opaque,read_packet,write_packet,seek) + ccall((:avio_alloc_context,libavformat),Ptr{AVIOContext},(Ptr{Cuchar},Cint,Cint,Ptr{Cvoid},Ptr{Cvoid},Ptr{Cvoid},Ptr{Cvoid}),buffer,buffer_size,write_flag,opaque,read_packet,write_packet,seek) end function avio_w8(s,b::Integer) - ccall((:avio_w8,libavformat),Void,(Ptr{AVIOContext},Cint),s,b) + ccall((:avio_w8,libavformat),Cvoid,(Ptr{AVIOContext},Cint),s,b) end function avio_write(s,buf,size::Integer) - ccall((:avio_write,libavformat),Void,(Ptr{AVIOContext},Ptr{Cuchar},Cint),s,buf,size) + ccall((:avio_write,libavformat),Cvoid,(Ptr{AVIOContext},Ptr{Cuchar},Cint),s,buf,size) end function avio_wl64(s,val::UInt64) - ccall((:avio_wl64,libavformat),Void,(Ptr{AVIOContext},UInt64),s,val) + ccall((:avio_wl64,libavformat),Cvoid,(Ptr{AVIOContext},UInt64),s,val) end function avio_wb64(s,val::UInt64) - ccall((:avio_wb64,libavformat),Void,(Ptr{AVIOContext},UInt64),s,val) + ccall((:avio_wb64,libavformat),Cvoid,(Ptr{AVIOContext},UInt64),s,val) end function avio_wl32(s,val::Integer) - ccall((:avio_wl32,libavformat),Void,(Ptr{AVIOContext},UInt32),s,val) + ccall((:avio_wl32,libavformat),Cvoid,(Ptr{AVIOContext},UInt32),s,val) end function avio_wb32(s,val::Integer) - ccall((:avio_wb32,libavformat),Void,(Ptr{AVIOContext},UInt32),s,val) + ccall((:avio_wb32,libavformat),Cvoid,(Ptr{AVIOContext},UInt32),s,val) end function avio_wl24(s,val::Integer) - ccall((:avio_wl24,libavformat),Void,(Ptr{AVIOContext},UInt32),s,val) + ccall((:avio_wl24,libavformat),Cvoid,(Ptr{AVIOContext},UInt32),s,val) end function avio_wb24(s,val::Integer) - ccall((:avio_wb24,libavformat),Void,(Ptr{AVIOContext},UInt32),s,val) + ccall((:avio_wb24,libavformat),Cvoid,(Ptr{AVIOContext},UInt32),s,val) end function avio_wl16(s,val::Integer) - ccall((:avio_wl16,libavformat),Void,(Ptr{AVIOContext},UInt32),s,val) + ccall((:avio_wl16,libavformat),Cvoid,(Ptr{AVIOContext},UInt32),s,val) end function avio_wb16(s,val::Integer) - ccall((:avio_wb16,libavformat),Void,(Ptr{AVIOContext},UInt32),s,val) + ccall((:avio_wb16,libavformat),Cvoid,(Ptr{AVIOContext},UInt32),s,val) end function avio_put_str(s,str) @@ -129,7 +129,7 @@ function url_feof(s) end function avio_flush(s) - ccall((:avio_flush,libavformat),Void,(Ptr{AVIOContext},),s) + ccall((:avio_flush,libavformat),Cvoid,(Ptr{AVIOContext},),s) end function avio_read(s,buf,size::Integer) @@ -209,7 +209,7 @@ function avio_close_dyn_buf(s,pbuffer) end function avio_enum_protocols(opaque,output::Integer) - ccall((:avio_enum_protocols,libavformat),Ptr{UInt8},(Ptr{Ptr{Void}},Cint),opaque,output) + ccall((:avio_enum_protocols,libavformat),Ptr{UInt8},(Ptr{Ptr{Cvoid}},Cint),opaque,output) end function avio_pause(h,pause::Integer) diff --git a/src/ffmpeg/AVFormat/v55/libavformat_h.jl b/src/ffmpeg/AVFormat/v55/libavformat_h.jl index 362e5672..12182d06 100644 --- a/src/ffmpeg/AVFormat/v55/libavformat_h.jl +++ b/src/ffmpeg/AVFormat/v55/libavformat_h.jl @@ -120,8 +120,8 @@ const AVIO_FLAG_NONBLOCK = 8 const AVIO_FLAG_DIRECT = 0x8000 struct AVIOInterruptCB - callback::Ptr{Void} - opaque::Ptr{Void} + callback::Ptr{Cvoid} + opaque::Ptr{Cvoid} end struct AVIOContext @@ -130,10 +130,10 @@ struct AVIOContext buffer_size::Cint buf_ptr::Ptr{Cuchar} buf_end::Ptr{Cuchar} - opaque::Ptr{Void} - read_packet::Ptr{Void} - write_packet::Ptr{Void} - seek::Ptr{Void} + opaque::Ptr{Cvoid} + read_packet::Ptr{Cvoid} + write_packet::Ptr{Cvoid} + seek::Ptr{Cvoid} pos::Int64 must_flush::Cint eof_reached::Cint @@ -141,10 +141,10 @@ struct AVIOContext max_packet_size::Cint checksum::Culong checksum_ptr::Ptr{Cuchar} - update_checksum::Ptr{Void} + update_checksum::Ptr{Cvoid} error::Cint - read_pause::Ptr{Void} - read_seek::Ptr{Void} + read_pause::Ptr{Cvoid} + read_seek::Ptr{Cvoid} seekable::Cint maxsize::Int64 direct::Cint @@ -222,7 +222,7 @@ const AVSEEK_FLAG_BYTE = 2 const AVSEEK_FLAG_ANY = 4 const AVSEEK_FLAG_FRAME = 8 -const AVCodecTag = Void +const AVCodecTag = Nothing struct AVInputFormat name::Ptr{UInt8} @@ -234,18 +234,18 @@ struct AVInputFormat next::Ptr{AVInputFormat} raw_codec_id::Cint priv_data_size::Cint - read_probe::Ptr{Void} - read_header::Ptr{Void} - read_packet::Ptr{Void} - read_close::Ptr{Void} - read_seek::Ptr{Void} - read_timestamp::Ptr{Void} - read_play::Ptr{Void} - read_pause::Ptr{Void} - read_seek2::Ptr{Void} - get_device_list::Ptr{Void} - create_device_capabilities::Ptr{Void} - free_device_capabilities::Ptr{Void} + read_probe::Ptr{Cvoid} + read_header::Ptr{Cvoid} + read_packet::Ptr{Cvoid} + read_close::Ptr{Cvoid} + read_seek::Ptr{Cvoid} + read_timestamp::Ptr{Cvoid} + read_play::Ptr{Cvoid} + read_pause::Ptr{Cvoid} + read_seek2::Ptr{Cvoid} + get_device_list::Ptr{Cvoid} + create_device_capabilities::Ptr{Cvoid} + free_device_capabilities::Ptr{Cvoid} end struct AVOutputFormat @@ -261,17 +261,17 @@ struct AVOutputFormat priv_class::Ptr{AVClass} next::Ptr{AVOutputFormat} priv_data_size::Cint - write_header::Ptr{Void} - write_packet::Ptr{Void} - write_trailer::Ptr{Void} - interleave_packet::Ptr{Void} - query_codec::Ptr{Void} - get_output_timestamp::Ptr{Void} - control_message::Ptr{Void} - write_uncoded_frame::Ptr{Void} - get_device_list::Ptr{Void} - create_device_capabilities::Ptr{Void} - free_device_capabilities::Ptr{Void} + write_header::Ptr{Cvoid} + write_packet::Ptr{Cvoid} + write_trailer::Ptr{Cvoid} + interleave_packet::Ptr{Cvoid} + query_codec::Ptr{Cvoid} + get_output_timestamp::Ptr{Cvoid} + control_message::Ptr{Cvoid} + write_uncoded_frame::Ptr{Cvoid} + get_device_list::Ptr{Cvoid} + create_device_capabilities::Ptr{Cvoid} + free_device_capabilities::Ptr{Cvoid} end struct AVFrac @@ -357,7 +357,7 @@ struct AVStream index::Cint id::Cint codec::Ptr{AVCodecContext} - priv_data::Ptr{Void} + priv_data::Ptr{Cvoid} pts::AVFrac time_base::AVRational start_time::Int64 @@ -371,7 +371,7 @@ struct AVStream attached_pic::AVPacket side_data::Ptr{AVPacketSideData} nb_side_data::Cint - info::Ptr{Void} + info::Ptr{Cvoid} pts_wrap_bits::Cint do_not_use::Int64 first_dts::Int64 @@ -1468,14 +1468,14 @@ const AVFMT_DURATION_FROM_STREAM = UInt32(1) const AVFMT_DURATION_FROM_BITRATE = UInt32(2) # end enum AVDurationEstimationMethod -const AVFormatInternal = Void -const av_format_control_message = Ptr{Void} +const AVFormatInternal = Nothing +const av_format_control_message = Ptr{Cvoid} struct AVFormatContext av_class::Ptr{AVClass} iformat::Ptr{AVInputFormat} oformat::Ptr{AVOutputFormat} - priv_data::Ptr{Void} + priv_data::Ptr{Cvoid} pb::Ptr{AVIOContext} ctx_flags::Cint nb_streams::UInt32 @@ -1538,11 +1538,11 @@ struct AVFormatContext audio_codec::Ptr{AVCodec} subtitle_codec::Ptr{AVCodec} metadata_header_padding::Cint - opaque::Ptr{Void} + opaque::Ptr{Cvoid} control_message_cb::av_format_control_message output_ts_offset::Int64 max_analyze_duration2::Int64 end -const AVDeviceInfoList = Void -const AVDeviceCapabilitiesQuery = Void +const AVDeviceInfoList = Nothing +const AVDeviceCapabilitiesQuery = Nothing diff --git a/src/ffmpeg/AVFormat/v56/avformat.jl b/src/ffmpeg/AVFormat/v56/avformat.jl index 6f081dd1..f4e8a857 100644 --- a/src/ffmpeg/AVFormat/v56/avformat.jl +++ b/src/ffmpeg/AVFormat/v56/avformat.jl @@ -108,7 +108,7 @@ function av_stream_get_r_frame_rate(s) end function av_stream_set_r_frame_rate(s,r::AVRational) - ccall((:av_stream_set_r_frame_rate,libavformat),Void,(Ptr{AVStream},AVRational),s,r) + ccall((:av_stream_set_r_frame_rate,libavformat),Cvoid,(Ptr{AVStream},AVRational),s,r) end function av_stream_get_parser(s) @@ -128,7 +128,7 @@ function av_format_get_video_codec(s) end function av_format_set_video_codec(s,c) - ccall((:av_format_set_video_codec,libavformat),Void,(Ptr{AVFormatContext},Ptr{AVCodec}),s,c) + ccall((:av_format_set_video_codec,libavformat),Cvoid,(Ptr{AVFormatContext},Ptr{AVCodec}),s,c) end function av_format_get_audio_codec(s) @@ -136,7 +136,7 @@ function av_format_get_audio_codec(s) end function av_format_set_audio_codec(s,c) - ccall((:av_format_set_audio_codec,libavformat),Void,(Ptr{AVFormatContext},Ptr{AVCodec}),s,c) + ccall((:av_format_set_audio_codec,libavformat),Cvoid,(Ptr{AVFormatContext},Ptr{AVCodec}),s,c) end function av_format_get_subtitle_codec(s) @@ -144,7 +144,7 @@ function av_format_get_subtitle_codec(s) end function av_format_set_subtitle_codec(s,c) - ccall((:av_format_set_subtitle_codec,libavformat),Void,(Ptr{AVFormatContext},Ptr{AVCodec}),s,c) + ccall((:av_format_set_subtitle_codec,libavformat),Cvoid,(Ptr{AVFormatContext},Ptr{AVCodec}),s,c) end function av_format_get_metadata_header_padding(s) @@ -152,15 +152,15 @@ function av_format_get_metadata_header_padding(s) end function av_format_set_metadata_header_padding(s,c::Integer) - ccall((:av_format_set_metadata_header_padding,libavformat),Void,(Ptr{AVFormatContext},Cint),s,c) + ccall((:av_format_set_metadata_header_padding,libavformat),Cvoid,(Ptr{AVFormatContext},Cint),s,c) end function av_format_get_opaque(s) - ccall((:av_format_get_opaque,libavformat),Ptr{Void},(Ptr{AVFormatContext},),s) + ccall((:av_format_get_opaque,libavformat),Ptr{Cvoid},(Ptr{AVFormatContext},),s) end function av_format_set_opaque(s,opaque) - ccall((:av_format_set_opaque,libavformat),Void,(Ptr{AVFormatContext},Ptr{Void}),s,opaque) + ccall((:av_format_set_opaque,libavformat),Cvoid,(Ptr{AVFormatContext},Ptr{Cvoid}),s,opaque) end function av_format_get_control_message_cb(s) @@ -168,11 +168,11 @@ function av_format_get_control_message_cb(s) end function av_format_set_control_message_cb(s,callback::av_format_control_message) - ccall((:av_format_set_control_message_cb,libavformat),Void,(Ptr{AVFormatContext},av_format_control_message),s,callback) + ccall((:av_format_set_control_message_cb,libavformat),Cvoid,(Ptr{AVFormatContext},av_format_control_message),s,callback) end function av_format_inject_global_side_data(s) - ccall((:av_format_inject_global_side_data,libavformat),Void,(Ptr{AVFormatContext},),s) + ccall((:av_format_inject_global_side_data,libavformat),Cvoid,(Ptr{AVFormatContext},),s) end function av_fmt_ctx_get_duration_estimation_method(ctx) @@ -192,15 +192,15 @@ function avformat_license() end function av_register_all() - ccall((:av_register_all,libavformat),Void,()) + ccall((:av_register_all,libavformat),Cvoid,()) end function av_register_input_format(format) - ccall((:av_register_input_format,libavformat),Void,(Ptr{AVInputFormat},),format) + ccall((:av_register_input_format,libavformat),Cvoid,(Ptr{AVInputFormat},),format) end function av_register_output_format(format) - ccall((:av_register_output_format,libavformat),Void,(Ptr{AVOutputFormat},),format) + ccall((:av_register_output_format,libavformat),Cvoid,(Ptr{AVOutputFormat},),format) end function avformat_network_init() @@ -224,7 +224,7 @@ function avformat_alloc_context() end function avformat_free_context(s) - ccall((:avformat_free_context,libavformat),Void,(Ptr{AVFormatContext},),s) + ccall((:avformat_free_context,libavformat),Cvoid,(Ptr{AVFormatContext},),s) end function avformat_get_class() @@ -264,11 +264,11 @@ function av_probe_input_format3(pd,is_opened::Integer,score_ret) end function av_probe_input_buffer2(pb,fmt,filename,logctx,offset::Integer,max_probe_size::Integer) - ccall((:av_probe_input_buffer2,libavformat),Cint,(Ptr{AVIOContext},Ptr{Ptr{AVInputFormat}},Ptr{UInt8},Ptr{Void},UInt32,UInt32),pb,fmt,filename,logctx,offset,max_probe_size) + ccall((:av_probe_input_buffer2,libavformat),Cint,(Ptr{AVIOContext},Ptr{Ptr{AVInputFormat}},Ptr{UInt8},Ptr{Cvoid},UInt32,UInt32),pb,fmt,filename,logctx,offset,max_probe_size) end function av_probe_input_buffer(pb,fmt,filename,logctx,offset::Integer,max_probe_size::Integer) - ccall((:av_probe_input_buffer,libavformat),Cint,(Ptr{AVIOContext},Ptr{Ptr{AVInputFormat}},Ptr{UInt8},Ptr{Void},UInt32,UInt32),pb,fmt,filename,logctx,offset,max_probe_size) + ccall((:av_probe_input_buffer,libavformat),Cint,(Ptr{AVIOContext},Ptr{Ptr{AVInputFormat}},Ptr{UInt8},Ptr{Cvoid},UInt32,UInt32),pb,fmt,filename,logctx,offset,max_probe_size) end function avformat_open_input(ps,filename,fmt,options) @@ -312,7 +312,7 @@ function av_read_pause(s) end function avformat_close_input(s) - ccall((:avformat_close_input,libavformat),Void,(Ptr{Ptr{AVFormatContext}},),s) + ccall((:avformat_close_input,libavformat),Cvoid,(Ptr{Ptr{AVFormatContext}},),s) end function avformat_write_header(s,options) @@ -356,19 +356,19 @@ function av_get_output_timestamp(s,stream::Integer,dts,wall) end function av_hex_dump(f,buf,size::Integer) - ccall((:av_hex_dump,libavformat),Void,(Ptr{Void},Ptr{UInt8},Cint),f,buf,size) + ccall((:av_hex_dump,libavformat),Cvoid,(Ptr{Cvoid},Ptr{UInt8},Cint),f,buf,size) end function av_hex_dump_log(avcl,level::Integer,buf,size::Integer) - ccall((:av_hex_dump_log,libavformat),Void,(Ptr{Void},Cint,Ptr{UInt8},Cint),avcl,level,buf,size) + ccall((:av_hex_dump_log,libavformat),Cvoid,(Ptr{Cvoid},Cint,Ptr{UInt8},Cint),avcl,level,buf,size) end function av_pkt_dump2(f,pkt,dump_payload::Integer,st) - ccall((:av_pkt_dump2,libavformat),Void,(Ptr{Void},Ptr{AVPacket},Cint,Ptr{AVStream}),f,pkt,dump_payload,st) + ccall((:av_pkt_dump2,libavformat),Cvoid,(Ptr{Cvoid},Ptr{AVPacket},Cint,Ptr{AVStream}),f,pkt,dump_payload,st) end function av_pkt_dump_log2(avcl,level::Integer,pkt,dump_payload::Integer,st) - ccall((:av_pkt_dump_log2,libavformat),Void,(Ptr{Void},Cint,Ptr{AVPacket},Cint,Ptr{AVStream}),avcl,level,pkt,dump_payload,st) + ccall((:av_pkt_dump_log2,libavformat),Cvoid,(Ptr{Cvoid},Cint,Ptr{AVPacket},Cint,Ptr{AVStream}),avcl,level,pkt,dump_payload,st) end function av_codec_get_id(tags,tag::Integer) @@ -396,11 +396,11 @@ function av_add_index_entry(st,pos::Int64,timestamp::Int64,size::Integer,distanc end function av_url_split(proto,proto_size::Integer,authorization,authorization_size::Integer,hostname,hostname_size::Integer,port_ptr,path,path_size::Integer,url) - ccall((:av_url_split,libavformat),Void,(Ptr{UInt8},Cint,Ptr{UInt8},Cint,Ptr{UInt8},Cint,Ptr{Cint},Ptr{UInt8},Cint,Ptr{UInt8}),proto,proto_size,authorization,authorization_size,hostname,hostname_size,port_ptr,path,path_size,url) + ccall((:av_url_split,libavformat),Cvoid,(Ptr{UInt8},Cint,Ptr{UInt8},Cint,Ptr{UInt8},Cint,Ptr{Cint},Ptr{UInt8},Cint,Ptr{UInt8}),proto,proto_size,authorization,authorization_size,hostname,hostname_size,port_ptr,path,path_size,url) end function av_dump_format(ic,index::Integer,url,is_output::Integer) - ccall((:av_dump_format,libavformat),Void,(Ptr{AVFormatContext},Cint,Ptr{UInt8},Cint),ic,index,url,is_output) + ccall((:av_dump_format,libavformat),Cvoid,(Ptr{AVFormatContext},Cint,Ptr{UInt8},Cint),ic,index,url,is_output) end function av_get_frame_filename(buf,buf_size::Integer,path,number::Integer) diff --git a/src/ffmpeg/AVFormat/v56/avio.jl b/src/ffmpeg/AVFormat/v56/avio.jl index b06e9bc7..b40107bc 100644 --- a/src/ffmpeg/AVFormat/v56/avio.jl +++ b/src/ffmpeg/AVFormat/v56/avio.jl @@ -59,47 +59,47 @@ function avio_check(url,flags::Integer) end function avio_alloc_context(buffer,buffer_size::Integer,write_flag::Integer,opaque,read_packet,write_packet,seek) - ccall((:avio_alloc_context,libavformat),Ptr{AVIOContext},(Ptr{Cuchar},Cint,Cint,Ptr{Void},Ptr{Void},Ptr{Void},Ptr{Void}),buffer,buffer_size,write_flag,opaque,read_packet,write_packet,seek) + ccall((:avio_alloc_context,libavformat),Ptr{AVIOContext},(Ptr{Cuchar},Cint,Cint,Ptr{Cvoid},Ptr{Cvoid},Ptr{Cvoid},Ptr{Cvoid}),buffer,buffer_size,write_flag,opaque,read_packet,write_packet,seek) end function avio_w8(s,b::Integer) - ccall((:avio_w8,libavformat),Void,(Ptr{AVIOContext},Cint),s,b) + ccall((:avio_w8,libavformat),Cvoid,(Ptr{AVIOContext},Cint),s,b) end function avio_write(s,buf,size::Integer) - ccall((:avio_write,libavformat),Void,(Ptr{AVIOContext},Ptr{Cuchar},Cint),s,buf,size) + ccall((:avio_write,libavformat),Cvoid,(Ptr{AVIOContext},Ptr{Cuchar},Cint),s,buf,size) end function avio_wl64(s,val::UInt64) - ccall((:avio_wl64,libavformat),Void,(Ptr{AVIOContext},UInt64),s,val) + ccall((:avio_wl64,libavformat),Cvoid,(Ptr{AVIOContext},UInt64),s,val) end function avio_wb64(s,val::UInt64) - ccall((:avio_wb64,libavformat),Void,(Ptr{AVIOContext},UInt64),s,val) + ccall((:avio_wb64,libavformat),Cvoid,(Ptr{AVIOContext},UInt64),s,val) end function avio_wl32(s,val::Integer) - ccall((:avio_wl32,libavformat),Void,(Ptr{AVIOContext},UInt32),s,val) + ccall((:avio_wl32,libavformat),Cvoid,(Ptr{AVIOContext},UInt32),s,val) end function avio_wb32(s,val::Integer) - ccall((:avio_wb32,libavformat),Void,(Ptr{AVIOContext},UInt32),s,val) + ccall((:avio_wb32,libavformat),Cvoid,(Ptr{AVIOContext},UInt32),s,val) end function avio_wl24(s,val::Integer) - ccall((:avio_wl24,libavformat),Void,(Ptr{AVIOContext},UInt32),s,val) + ccall((:avio_wl24,libavformat),Cvoid,(Ptr{AVIOContext},UInt32),s,val) end function avio_wb24(s,val::Integer) - ccall((:avio_wb24,libavformat),Void,(Ptr{AVIOContext},UInt32),s,val) + ccall((:avio_wb24,libavformat),Cvoid,(Ptr{AVIOContext},UInt32),s,val) end function avio_wl16(s,val::Integer) - ccall((:avio_wl16,libavformat),Void,(Ptr{AVIOContext},UInt32),s,val) + ccall((:avio_wl16,libavformat),Cvoid,(Ptr{AVIOContext},UInt32),s,val) end function avio_wb16(s,val::Integer) - ccall((:avio_wb16,libavformat),Void,(Ptr{AVIOContext},UInt32),s,val) + ccall((:avio_wb16,libavformat),Cvoid,(Ptr{AVIOContext},UInt32),s,val) end function avio_put_str(s,str) @@ -135,7 +135,7 @@ function url_feof(s) end function avio_flush(s) - ccall((:avio_flush,libavformat),Void,(Ptr{AVIOContext},),s) + ccall((:avio_flush,libavformat),Cvoid,(Ptr{AVIOContext},),s) end function avio_read(s,buf,size::Integer) @@ -215,7 +215,7 @@ function avio_close_dyn_buf(s,pbuffer) end function avio_enum_protocols(opaque,output::Integer) - ccall((:avio_enum_protocols,libavformat),Ptr{UInt8},(Ptr{Ptr{Void}},Cint),opaque,output) + ccall((:avio_enum_protocols,libavformat),Ptr{UInt8},(Ptr{Ptr{Cvoid}},Cint),opaque,output) end function avio_pause(h,pause::Integer) diff --git a/src/ffmpeg/AVFormat/v56/libavformat_h.jl b/src/ffmpeg/AVFormat/v56/libavformat_h.jl index 9a7fe096..30fbd429 100644 --- a/src/ffmpeg/AVFormat/v56/libavformat_h.jl +++ b/src/ffmpeg/AVFormat/v56/libavformat_h.jl @@ -124,8 +124,8 @@ const AVIO_FLAG_NONBLOCK = 8 const AVIO_FLAG_DIRECT = 0x8000 struct AVIOInterruptCB - callback::Ptr{Void} - opaque::Ptr{Void} + callback::Ptr{Cvoid} + opaque::Ptr{Cvoid} end struct AVIOContext @@ -134,10 +134,10 @@ struct AVIOContext buffer_size::Cint buf_ptr::Ptr{Cuchar} buf_end::Ptr{Cuchar} - opaque::Ptr{Void} - read_packet::Ptr{Void} - write_packet::Ptr{Void} - seek::Ptr{Void} + opaque::Ptr{Cvoid} + read_packet::Ptr{Cvoid} + write_packet::Ptr{Cvoid} + seek::Ptr{Cvoid} pos::Int64 must_flush::Cint eof_reached::Cint @@ -145,10 +145,10 @@ struct AVIOContext max_packet_size::Cint checksum::Culong checksum_ptr::Ptr{Cuchar} - update_checksum::Ptr{Void} + update_checksum::Ptr{Cvoid} error::Cint - read_pause::Ptr{Void} - read_seek::Ptr{Void} + read_pause::Ptr{Cvoid} + read_seek::Ptr{Cvoid} seekable::Cint maxsize::Int64 direct::Cint @@ -158,7 +158,7 @@ struct AVIOContext orig_buffer_size::Cint end -const AVBPrint = Void +const AVBPrint = Nothing const AVPROBE_SCORE_MAX = 100 const AVPROBE_SCORE_RETRY = AVPROBE_SCORE_MAX / 4 @@ -231,7 +231,7 @@ const AVSEEK_FLAG_BYTE = 2 const AVSEEK_FLAG_ANY = 4 const AVSEEK_FLAG_FRAME = 8 -const AVCodecTag = Void +const AVCodecTag = Nothing struct AVInputFormat name::Ptr{UInt8} @@ -244,18 +244,18 @@ struct AVInputFormat next::Ptr{AVInputFormat} raw_codec_id::Cint priv_data_size::Cint - read_probe::Ptr{Void} - read_header::Ptr{Void} - read_packet::Ptr{Void} - read_close::Ptr{Void} - read_seek::Ptr{Void} - read_timestamp::Ptr{Void} - read_play::Ptr{Void} - read_pause::Ptr{Void} - read_seek2::Ptr{Void} - get_device_list::Ptr{Void} - create_device_capabilities::Ptr{Void} - free_device_capabilities::Ptr{Void} + read_probe::Ptr{Cvoid} + read_header::Ptr{Cvoid} + read_packet::Ptr{Cvoid} + read_close::Ptr{Cvoid} + read_seek::Ptr{Cvoid} + read_timestamp::Ptr{Cvoid} + read_play::Ptr{Cvoid} + read_pause::Ptr{Cvoid} + read_seek2::Ptr{Cvoid} + get_device_list::Ptr{Cvoid} + create_device_capabilities::Ptr{Cvoid} + free_device_capabilities::Ptr{Cvoid} end struct AVOutputFormat @@ -271,17 +271,17 @@ struct AVOutputFormat priv_class::Ptr{AVClass} next::Ptr{AVOutputFormat} priv_data_size::Cint - write_header::Ptr{Void} - write_packet::Ptr{Void} - write_trailer::Ptr{Void} - interleave_packet::Ptr{Void} - query_codec::Ptr{Void} - get_output_timestamp::Ptr{Void} - control_message::Ptr{Void} - write_uncoded_frame::Ptr{Void} - get_device_list::Ptr{Void} - create_device_capabilities::Ptr{Void} - free_device_capabilities::Ptr{Void} + write_header::Ptr{Cvoid} + write_packet::Ptr{Cvoid} + write_trailer::Ptr{Cvoid} + interleave_packet::Ptr{Cvoid} + query_codec::Ptr{Cvoid} + get_output_timestamp::Ptr{Cvoid} + control_message::Ptr{Cvoid} + write_uncoded_frame::Ptr{Cvoid} + get_device_list::Ptr{Cvoid} + create_device_capabilities::Ptr{Cvoid} + free_device_capabilities::Ptr{Cvoid} end struct AVFrac @@ -368,7 +368,7 @@ struct AVStream index::Cint id::Cint codec::Ptr{AVCodecContext} - priv_data::Ptr{Void} + priv_data::Ptr{Cvoid} pts::AVFrac time_base::AVRational start_time::Int64 @@ -383,7 +383,7 @@ struct AVStream side_data::Ptr{AVPacketSideData} nb_side_data::Cint event_flags::Cint - info::Ptr{Void} + info::Ptr{Cvoid} pts_wrap_bits::Cint first_dts::Int64 cur_dts::Int64 @@ -1481,14 +1481,14 @@ const AVFMT_DURATION_FROM_STREAM = UInt32(1) const AVFMT_DURATION_FROM_BITRATE = UInt32(2) # end enum AVDurationEstimationMethod -const AVFormatInternal = Void -const av_format_control_message = Ptr{Void} +const AVFormatInternal = Nothing +const av_format_control_message = Ptr{Cvoid} struct AVFormatContext av_class::Ptr{AVClass} iformat::Ptr{AVInputFormat} oformat::Ptr{AVOutputFormat} - priv_data::Ptr{Void} + priv_data::Ptr{Cvoid} pb::Ptr{AVIOContext} ctx_flags::Cint nb_streams::UInt32 @@ -1553,7 +1553,7 @@ struct AVFormatContext audio_codec::Ptr{AVCodec} subtitle_codec::Ptr{AVCodec} metadata_header_padding::Cint - opaque::Ptr{Void} + opaque::Ptr{Cvoid} control_message_cb::av_format_control_message output_ts_offset::Int64 max_analyze_duration2::Int64 @@ -1561,5 +1561,5 @@ struct AVFormatContext dump_separator::Ptr{UInt8} end -const AVDeviceInfoList = Void -const AVDeviceCapabilitiesQuery = Void +const AVDeviceInfoList = Nothing +const AVDeviceCapabilitiesQuery = Nothing diff --git a/src/ffmpeg/AVFormat/v57/avformat.jl b/src/ffmpeg/AVFormat/v57/avformat.jl index 469de08f..52c2815e 100644 --- a/src/ffmpeg/AVFormat/v57/avformat.jl +++ b/src/ffmpeg/AVFormat/v57/avformat.jl @@ -118,7 +118,7 @@ function av_stream_get_r_frame_rate(s) end function av_stream_set_r_frame_rate(s,r::AVRational) - ccall((:av_stream_set_r_frame_rate,libavformat),Void,(Ptr{AVStream},AVRational),s,r) + ccall((:av_stream_set_r_frame_rate,libavformat),Cvoid,(Ptr{AVStream},AVRational),s,r) end function av_stream_get_parser(s) @@ -130,7 +130,7 @@ function av_stream_get_recommended_encoder_configuration(s) end function av_stream_set_recommended_encoder_configuration(s,configuration) - ccall((:av_stream_set_recommended_encoder_configuration,libavformat),Void,(Ptr{AVStream},Ptr{UInt8}),s,configuration) + ccall((:av_stream_set_recommended_encoder_configuration,libavformat),Cvoid,(Ptr{AVStream},Ptr{UInt8}),s,configuration) end function av_stream_get_end_pts(st) @@ -146,7 +146,7 @@ function av_format_get_video_codec(s) end function av_format_set_video_codec(s,c) - ccall((:av_format_set_video_codec,libavformat),Void,(Ptr{AVFormatContext},Ptr{AVCodec}),s,c) + ccall((:av_format_set_video_codec,libavformat),Cvoid,(Ptr{AVFormatContext},Ptr{AVCodec}),s,c) end function av_format_get_audio_codec(s) @@ -154,7 +154,7 @@ function av_format_get_audio_codec(s) end function av_format_set_audio_codec(s,c) - ccall((:av_format_set_audio_codec,libavformat),Void,(Ptr{AVFormatContext},Ptr{AVCodec}),s,c) + ccall((:av_format_set_audio_codec,libavformat),Cvoid,(Ptr{AVFormatContext},Ptr{AVCodec}),s,c) end function av_format_get_subtitle_codec(s) @@ -162,7 +162,7 @@ function av_format_get_subtitle_codec(s) end function av_format_set_subtitle_codec(s,c) - ccall((:av_format_set_subtitle_codec,libavformat),Void,(Ptr{AVFormatContext},Ptr{AVCodec}),s,c) + ccall((:av_format_set_subtitle_codec,libavformat),Cvoid,(Ptr{AVFormatContext},Ptr{AVCodec}),s,c) end function av_format_get_data_codec(s) @@ -170,7 +170,7 @@ function av_format_get_data_codec(s) end function av_format_set_data_codec(s,c) - ccall((:av_format_set_data_codec,libavformat),Void,(Ptr{AVFormatContext},Ptr{AVCodec}),s,c) + ccall((:av_format_set_data_codec,libavformat),Cvoid,(Ptr{AVFormatContext},Ptr{AVCodec}),s,c) end function av_format_get_metadata_header_padding(s) @@ -178,15 +178,15 @@ function av_format_get_metadata_header_padding(s) end function av_format_set_metadata_header_padding(s,c::Integer) - ccall((:av_format_set_metadata_header_padding,libavformat),Void,(Ptr{AVFormatContext},Cint),s,c) + ccall((:av_format_set_metadata_header_padding,libavformat),Cvoid,(Ptr{AVFormatContext},Cint),s,c) end function av_format_get_opaque(s) - ccall((:av_format_get_opaque,libavformat),Ptr{Void},(Ptr{AVFormatContext},),s) + ccall((:av_format_get_opaque,libavformat),Ptr{Cvoid},(Ptr{AVFormatContext},),s) end function av_format_set_opaque(s,opaque) - ccall((:av_format_set_opaque,libavformat),Void,(Ptr{AVFormatContext},Ptr{Void}),s,opaque) + ccall((:av_format_set_opaque,libavformat),Cvoid,(Ptr{AVFormatContext},Ptr{Cvoid}),s,opaque) end function av_format_get_control_message_cb(s) @@ -194,7 +194,7 @@ function av_format_get_control_message_cb(s) end function av_format_set_control_message_cb(s,callback::av_format_control_message) - ccall((:av_format_set_control_message_cb,libavformat),Void,(Ptr{AVFormatContext},av_format_control_message),s,callback) + ccall((:av_format_set_control_message_cb,libavformat),Cvoid,(Ptr{AVFormatContext},av_format_control_message),s,callback) end function av_format_get_open_cb(s) @@ -202,11 +202,11 @@ function av_format_get_open_cb(s) end function av_format_set_open_cb(s,callback::AVOpenCallback) - ccall((:av_format_set_open_cb,libavformat),Void,(Ptr{AVFormatContext},AVOpenCallback),s,callback) + ccall((:av_format_set_open_cb,libavformat),Cvoid,(Ptr{AVFormatContext},AVOpenCallback),s,callback) end function av_format_inject_global_side_data(s) - ccall((:av_format_inject_global_side_data,libavformat),Void,(Ptr{AVFormatContext},),s) + ccall((:av_format_inject_global_side_data,libavformat),Cvoid,(Ptr{AVFormatContext},),s) end function av_fmt_ctx_get_duration_estimation_method(ctx) @@ -226,15 +226,15 @@ function avformat_license() end function av_register_all() - ccall((:av_register_all,libavformat),Void,()) + ccall((:av_register_all,libavformat),Cvoid,()) end function av_register_input_format(format) - ccall((:av_register_input_format,libavformat),Void,(Ptr{AVInputFormat},),format) + ccall((:av_register_input_format,libavformat),Cvoid,(Ptr{AVInputFormat},),format) end function av_register_output_format(format) - ccall((:av_register_output_format,libavformat),Void,(Ptr{AVOutputFormat},),format) + ccall((:av_register_output_format,libavformat),Cvoid,(Ptr{AVOutputFormat},),format) end function avformat_network_init() @@ -258,7 +258,7 @@ function avformat_alloc_context() end function avformat_free_context(s) - ccall((:avformat_free_context,libavformat),Void,(Ptr{AVFormatContext},),s) + ccall((:avformat_free_context,libavformat),Cvoid,(Ptr{AVFormatContext},),s) end function avformat_get_class() @@ -302,11 +302,11 @@ function av_probe_input_format3(pd,is_opened::Integer,score_ret) end function av_probe_input_buffer2(pb,fmt,url,logctx,offset::Integer,max_probe_size::Integer) - ccall((:av_probe_input_buffer2,libavformat),Cint,(Ptr{AVIOContext},Ptr{Ptr{AVInputFormat}},Ptr{UInt8},Ptr{Void},UInt32,UInt32),pb,fmt,url,logctx,offset,max_probe_size) + ccall((:av_probe_input_buffer2,libavformat),Cint,(Ptr{AVIOContext},Ptr{Ptr{AVInputFormat}},Ptr{UInt8},Ptr{Cvoid},UInt32,UInt32),pb,fmt,url,logctx,offset,max_probe_size) end function av_probe_input_buffer(pb,fmt,url,logctx,offset::Integer,max_probe_size::Integer) - ccall((:av_probe_input_buffer,libavformat),Cint,(Ptr{AVIOContext},Ptr{Ptr{AVInputFormat}},Ptr{UInt8},Ptr{Void},UInt32,UInt32),pb,fmt,url,logctx,offset,max_probe_size) + ccall((:av_probe_input_buffer,libavformat),Cint,(Ptr{AVIOContext},Ptr{Ptr{AVInputFormat}},Ptr{UInt8},Ptr{Cvoid},UInt32,UInt32),pb,fmt,url,logctx,offset,max_probe_size) end function avformat_open_input(ps,url,fmt,options) @@ -326,7 +326,7 @@ function av_find_program_from_stream(ic,last,s::Integer) end function av_program_add_stream_index(ac,progid::Integer,idx::Integer) - ccall((:av_program_add_stream_index,libavformat),Void,(Ptr{AVFormatContext},Cint,UInt32),ac,progid,idx) + ccall((:av_program_add_stream_index,libavformat),Cvoid,(Ptr{AVFormatContext},Cint,UInt32),ac,progid,idx) end function av_find_best_stream(ic,_type::AVMediaType,wanted_stream_nb::Integer,related_stream::Integer,decoder_ret,flags::Integer) @@ -358,7 +358,7 @@ function av_read_pause(s) end function avformat_close_input(s) - ccall((:avformat_close_input,libavformat),Void,(Ptr{Ptr{AVFormatContext}},),s) + ccall((:avformat_close_input,libavformat),Cvoid,(Ptr{Ptr{AVFormatContext}},),s) end function avformat_write_header(s,options) @@ -402,19 +402,19 @@ function av_get_output_timestamp(s,stream::Integer,dts,wall) end function av_hex_dump(f,buf,size::Integer) - ccall((:av_hex_dump,libavformat),Void,(Ptr{Void},Ptr{UInt8},Cint),f,buf,size) + ccall((:av_hex_dump,libavformat),Cvoid,(Ptr{Cvoid},Ptr{UInt8},Cint),f,buf,size) end function av_hex_dump_log(avcl,level::Integer,buf,size::Integer) - ccall((:av_hex_dump_log,libavformat),Void,(Ptr{Void},Cint,Ptr{UInt8},Cint),avcl,level,buf,size) + ccall((:av_hex_dump_log,libavformat),Cvoid,(Ptr{Cvoid},Cint,Ptr{UInt8},Cint),avcl,level,buf,size) end function av_pkt_dump2(f,pkt,dump_payload::Integer,st) - ccall((:av_pkt_dump2,libavformat),Void,(Ptr{Void},Ptr{AVPacket},Cint,Ptr{AVStream}),f,pkt,dump_payload,st) + ccall((:av_pkt_dump2,libavformat),Cvoid,(Ptr{Cvoid},Ptr{AVPacket},Cint,Ptr{AVStream}),f,pkt,dump_payload,st) end function av_pkt_dump_log2(avcl,level::Integer,pkt,dump_payload::Integer,st) - ccall((:av_pkt_dump_log2,libavformat),Void,(Ptr{Void},Cint,Ptr{AVPacket},Cint,Ptr{AVStream}),avcl,level,pkt,dump_payload,st) + ccall((:av_pkt_dump_log2,libavformat),Cvoid,(Ptr{Cvoid},Cint,Ptr{AVPacket},Cint,Ptr{AVStream}),avcl,level,pkt,dump_payload,st) end function av_codec_get_id(tags,tag::Integer) @@ -442,11 +442,11 @@ function av_add_index_entry(st,pos::Int64,timestamp::Int64,size::Integer,distanc end function av_url_split(proto,proto_size::Integer,authorization,authorization_size::Integer,hostname,hostname_size::Integer,port_ptr,path,path_size::Integer,url) - ccall((:av_url_split,libavformat),Void,(Ptr{UInt8},Cint,Ptr{UInt8},Cint,Ptr{UInt8},Cint,Ptr{Cint},Ptr{UInt8},Cint,Ptr{UInt8}),proto,proto_size,authorization,authorization_size,hostname,hostname_size,port_ptr,path,path_size,url) + ccall((:av_url_split,libavformat),Cvoid,(Ptr{UInt8},Cint,Ptr{UInt8},Cint,Ptr{UInt8},Cint,Ptr{Cint},Ptr{UInt8},Cint,Ptr{UInt8}),proto,proto_size,authorization,authorization_size,hostname,hostname_size,port_ptr,path,path_size,url) end function av_dump_format(ic,index::Integer,url,is_output::Integer) - ccall((:av_dump_format,libavformat),Void,(Ptr{AVFormatContext},Cint,Ptr{UInt8},Cint),ic,index,url,is_output) + ccall((:av_dump_format,libavformat),Cvoid,(Ptr{AVFormatContext},Cint,Ptr{UInt8},Cint),ic,index,url,is_output) end function av_get_frame_filename(buf,buf_size::Integer,path,number::Integer) diff --git a/src/ffmpeg/AVFormat/v57/avio.jl b/src/ffmpeg/AVFormat/v57/avio.jl index 3dd03615..27e0f6b7 100644 --- a/src/ffmpeg/AVFormat/v57/avio.jl +++ b/src/ffmpeg/AVFormat/v57/avio.jl @@ -88,51 +88,51 @@ function avio_close_dir(s) end function avio_free_directory_entry(entry) - ccall((:avio_free_directory_entry,libavformat),Void,(Ptr{Ptr{AVIODirEntry}},),entry) + ccall((:avio_free_directory_entry,libavformat),Cvoid,(Ptr{Ptr{AVIODirEntry}},),entry) end function avio_alloc_context(buffer,buffer_size::Integer,write_flag::Integer,opaque,read_packet,write_packet,seek) - ccall((:avio_alloc_context,libavformat),Ptr{AVIOContext},(Ptr{Cuchar},Cint,Cint,Ptr{Void},Ptr{Void},Ptr{Void},Ptr{Void}),buffer,buffer_size,write_flag,opaque,read_packet,write_packet,seek) + ccall((:avio_alloc_context,libavformat),Ptr{AVIOContext},(Ptr{Cuchar},Cint,Cint,Ptr{Cvoid},Ptr{Cvoid},Ptr{Cvoid},Ptr{Cvoid}),buffer,buffer_size,write_flag,opaque,read_packet,write_packet,seek) end function avio_w8(s,b::Integer) - ccall((:avio_w8,libavformat),Void,(Ptr{AVIOContext},Cint),s,b) + ccall((:avio_w8,libavformat),Cvoid,(Ptr{AVIOContext},Cint),s,b) end function avio_write(s,buf,size::Integer) - ccall((:avio_write,libavformat),Void,(Ptr{AVIOContext},Ptr{Cuchar},Cint),s,buf,size) + ccall((:avio_write,libavformat),Cvoid,(Ptr{AVIOContext},Ptr{Cuchar},Cint),s,buf,size) end function avio_wl64(s,val::UInt64) - ccall((:avio_wl64,libavformat),Void,(Ptr{AVIOContext},UInt64),s,val) + ccall((:avio_wl64,libavformat),Cvoid,(Ptr{AVIOContext},UInt64),s,val) end function avio_wb64(s,val::UInt64) - ccall((:avio_wb64,libavformat),Void,(Ptr{AVIOContext},UInt64),s,val) + ccall((:avio_wb64,libavformat),Cvoid,(Ptr{AVIOContext},UInt64),s,val) end function avio_wl32(s,val::Integer) - ccall((:avio_wl32,libavformat),Void,(Ptr{AVIOContext},UInt32),s,val) + ccall((:avio_wl32,libavformat),Cvoid,(Ptr{AVIOContext},UInt32),s,val) end function avio_wb32(s,val::Integer) - ccall((:avio_wb32,libavformat),Void,(Ptr{AVIOContext},UInt32),s,val) + ccall((:avio_wb32,libavformat),Cvoid,(Ptr{AVIOContext},UInt32),s,val) end function avio_wl24(s,val::Integer) - ccall((:avio_wl24,libavformat),Void,(Ptr{AVIOContext},UInt32),s,val) + ccall((:avio_wl24,libavformat),Cvoid,(Ptr{AVIOContext},UInt32),s,val) end function avio_wb24(s,val::Integer) - ccall((:avio_wb24,libavformat),Void,(Ptr{AVIOContext},UInt32),s,val) + ccall((:avio_wb24,libavformat),Cvoid,(Ptr{AVIOContext},UInt32),s,val) end function avio_wl16(s,val::Integer) - ccall((:avio_wl16,libavformat),Void,(Ptr{AVIOContext},UInt32),s,val) + ccall((:avio_wl16,libavformat),Cvoid,(Ptr{AVIOContext},UInt32),s,val) end function avio_wb16(s,val::Integer) - ccall((:avio_wb16,libavformat),Void,(Ptr{AVIOContext},UInt32),s,val) + ccall((:avio_wb16,libavformat),Cvoid,(Ptr{AVIOContext},UInt32),s,val) end function avio_put_str(s,str) @@ -172,7 +172,7 @@ function url_feof(s) end function avio_flush(s) - ccall((:avio_flush,libavformat),Void,(Ptr{AVIOContext},),s) + ccall((:avio_flush,libavformat),Cvoid,(Ptr{AVIOContext},),s) end function avio_read(s,buf,size::Integer) @@ -252,7 +252,7 @@ function avio_close_dyn_buf(s,pbuffer) end function avio_enum_protocols(opaque,output::Integer) - ccall((:avio_enum_protocols,libavformat),Cstring,(Ptr{Ptr{Void}},Cint),opaque,output) + ccall((:avio_enum_protocols,libavformat),Cstring,(Ptr{Ptr{Cvoid}},Cint),opaque,output) end function avio_pause(h,pause::Integer) diff --git a/src/ffmpeg/AVFormat/v57/libavformat_h.jl b/src/ffmpeg/AVFormat/v57/libavformat_h.jl index 9e83b05c..75abd1fa 100644 --- a/src/ffmpeg/AVFormat/v57/libavformat_h.jl +++ b/src/ffmpeg/AVFormat/v57/libavformat_h.jl @@ -143,8 +143,8 @@ const AVIO_FLAG_NONBLOCK = 8 const AVIO_FLAG_DIRECT = 0x8000 struct AVIOInterruptCB - callback::Ptr{Void} - opaque::Ptr{Void} + callback::Ptr{Cvoid} + opaque::Ptr{Cvoid} end # begin enum AVIODirEntryType @@ -177,7 +177,7 @@ end struct AVIODirContext # url_context::Ptr{URLContext} - url_context::Ptr{Void} + url_context::Ptr{Cvoid} end struct AVIOContext @@ -186,10 +186,10 @@ struct AVIOContext buffer_size::Cint buf_ptr::Ptr{Cuchar} buf_end::Ptr{Cuchar} - opaque::Ptr{Void} - read_packet::Ptr{Void} - write_packet::Ptr{Void} - seek::Ptr{Void} + opaque::Ptr{Cvoid} + read_packet::Ptr{Cvoid} + write_packet::Ptr{Cvoid} + seek::Ptr{Cvoid} pos::Int64 must_flush::Cint eof_reached::Cint @@ -197,10 +197,10 @@ struct AVIOContext max_packet_size::Cint checksum::Culong checksum_ptr::Ptr{Cuchar} - update_checksum::Ptr{Void} + update_checksum::Ptr{Cvoid} error::Cint - read_pause::Ptr{Void} - read_seek::Ptr{Void} + read_pause::Ptr{Cvoid} + read_seek::Ptr{Cvoid} seekable::Cint maxsize::Int64 direct::Cint @@ -212,7 +212,7 @@ struct AVIOContext protocol_whitelist::Cstring end -const AVBPrint = Void +const AVBPrint = Nothing const LIBAVFORMAT_VERSION_MAJOR = 57 const LIBAVFORMAT_VERSION_MINOR = 25 @@ -306,7 +306,7 @@ const AVSEEK_FLAG_BYTE = 2 const AVSEEK_FLAG_ANY = 4 const AVSEEK_FLAG_FRAME = 8 -const AVCodecTag = Void +const AVCodecTag = Nothing struct AVInputFormat name::Cstring @@ -319,18 +319,18 @@ struct AVInputFormat next::Ptr{AVInputFormat} raw_codec_id::Cint priv_data_size::Cint - read_probe::Ptr{Void} - read_header::Ptr{Void} - read_packet::Ptr{Void} - read_close::Ptr{Void} - read_seek::Ptr{Void} - read_timestamp::Ptr{Void} - read_play::Ptr{Void} - read_pause::Ptr{Void} - read_seek2::Ptr{Void} - get_device_list::Ptr{Void} - create_device_capabilities::Ptr{Void} - free_device_capabilities::Ptr{Void} + read_probe::Ptr{Cvoid} + read_header::Ptr{Cvoid} + read_packet::Ptr{Cvoid} + read_close::Ptr{Cvoid} + read_seek::Ptr{Cvoid} + read_timestamp::Ptr{Cvoid} + read_play::Ptr{Cvoid} + read_pause::Ptr{Cvoid} + read_seek2::Ptr{Cvoid} + get_device_list::Ptr{Cvoid} + create_device_capabilities::Ptr{Cvoid} + free_device_capabilities::Ptr{Cvoid} end struct AVOutputFormat @@ -346,21 +346,21 @@ struct AVOutputFormat priv_class::Ptr{AVClass} next::Ptr{AVOutputFormat} priv_data_size::Cint - write_header::Ptr{Void} - write_packet::Ptr{Void} - write_trailer::Ptr{Void} - interleave_packet::Ptr{Void} - query_codec::Ptr{Void} - get_output_timestamp::Ptr{Void} - control_message::Ptr{Void} - write_uncoded_frame::Ptr{Void} - get_device_list::Ptr{Void} - create_device_capabilities::Ptr{Void} - free_device_capabilities::Ptr{Void} + write_header::Ptr{Cvoid} + write_packet::Ptr{Cvoid} + write_trailer::Ptr{Cvoid} + interleave_packet::Ptr{Cvoid} + query_codec::Ptr{Cvoid} + get_output_timestamp::Ptr{Cvoid} + control_message::Ptr{Cvoid} + write_uncoded_frame::Ptr{Cvoid} + get_device_list::Ptr{Cvoid} + create_device_capabilities::Ptr{Cvoid} + free_device_capabilities::Ptr{Cvoid} data_codec::AVCodecID - init::Ptr{Void} - deinit::Ptr{Void} - check_bitstream::Ptr{Void} + init::Ptr{Cvoid} + deinit::Ptr{Cvoid} + check_bitstream::Ptr{Cvoid} end struct AVFrac @@ -399,13 +399,13 @@ struct AVIndexEntry min_distance::Cint end -const AVStreamInternal = Void +const AVStreamInternal = Nothing struct AVStream index::Cint id::Cint codec::Ptr{AVCodecContext} - priv_data::Ptr{Void} + priv_data::Ptr{Cvoid} pts::AVFrac time_base::AVRational start_time::Int64 @@ -420,7 +420,7 @@ struct AVStream side_data::Ptr{AVPacketSideData} nb_side_data::Cint event_flags::Cint - info::Ptr{Void} + info::Ptr{Cvoid} pts_wrap_bits::Cint first_dts::Int64 cur_dts::Int64 @@ -459,7 +459,7 @@ struct AVStream inject_global_side_data::Cint recommended_encoder_configuration::Cstring display_aspect_ratio::AVRational - priv_pts::Ptr{Void} #FFFrac} + priv_pts::Ptr{Cvoid} #FFFrac} internal::Ptr{AVStreamInternal} end @@ -494,14 +494,14 @@ const AVFMT_DURATION_FROM_STREAM = (UInt32)(1) const AVFMT_DURATION_FROM_BITRATE = (UInt32)(2) # end enum AVDurationEstimationMethod -const AVFormatInternal = Void -const av_format_control_message = Ptr{Void} +const AVFormatInternal = Nothing +const av_format_control_message = Ptr{Cvoid} struct AVFormatContext av_class::Ptr{AVClass} iformat::Ptr{AVInputFormat} oformat::Ptr{AVOutputFormat} - priv_data::Ptr{Void} + priv_data::Ptr{Cvoid} pb::Ptr{AVIOContext} ctx_flags::Cint nb_streams::UInt32 @@ -559,17 +559,17 @@ struct AVFormatContext subtitle_codec::Ptr{AVCodec} data_codec::Ptr{AVCodec} metadata_header_padding::Cint - opaque::Ptr{Void} + opaque::Ptr{Cvoid} control_message_cb::av_format_control_message output_ts_offset::Int64 dump_separator::Ptr{UInt8} data_codec_id::AVCodecID - open_cb::Ptr{Void} + open_cb::Ptr{Cvoid} protocol_whitelist::Cstring - io_open::Ptr{Void} - io_close::Ptr{Void} + io_open::Ptr{Cvoid} + io_close::Ptr{Cvoid} end -const AVDeviceInfoList = Void -const AVDeviceCapabilitiesQuery = Void -const AVOpenCallback = Ptr{Void} +const AVDeviceInfoList = Nothing +const AVDeviceCapabilitiesQuery = Nothing +const AVOpenCallback = Ptr{Cvoid} diff --git a/src/ffmpeg/AVUtil/v52/audio_fifo.jl b/src/ffmpeg/AVUtil/v52/audio_fifo.jl index 6f8f754e..dc75f443 100644 --- a/src/ffmpeg/AVUtil/v52/audio_fifo.jl +++ b/src/ffmpeg/AVUtil/v52/audio_fifo.jl @@ -15,7 +15,7 @@ export function av_audio_fifo_free(af) - ccall((:av_audio_fifo_free,libavutil),Void,(Ptr{AVAudioFifo},),af) + ccall((:av_audio_fifo_free,libavutil),Cvoid,(Ptr{AVAudioFifo},),af) end function av_audio_fifo_alloc(sample_fmt::AVSampleFormat,channels::Integer,nb_samples::Integer) @@ -27,11 +27,11 @@ function av_audio_fifo_realloc(af,nb_samples::Integer) end function av_audio_fifo_write(af,data,nb_samples::Integer) - ccall((:av_audio_fifo_write,libavutil),Cint,(Ptr{AVAudioFifo},Ptr{Ptr{Void}},Cint),af,data,nb_samples) + ccall((:av_audio_fifo_write,libavutil),Cint,(Ptr{AVAudioFifo},Ptr{Ptr{Cvoid}},Cint),af,data,nb_samples) end function av_audio_fifo_read(af,data,nb_samples::Integer) - ccall((:av_audio_fifo_read,libavutil),Cint,(Ptr{AVAudioFifo},Ptr{Ptr{Void}},Cint),af,data,nb_samples) + ccall((:av_audio_fifo_read,libavutil),Cint,(Ptr{AVAudioFifo},Ptr{Ptr{Cvoid}},Cint),af,data,nb_samples) end function av_audio_fifo_drain(af,nb_samples::Integer) @@ -39,7 +39,7 @@ function av_audio_fifo_drain(af,nb_samples::Integer) end function av_audio_fifo_reset(af) - ccall((:av_audio_fifo_reset,libavutil),Void,(Ptr{AVAudioFifo},),af) + ccall((:av_audio_fifo_reset,libavutil),Cvoid,(Ptr{AVAudioFifo},),af) end function av_audio_fifo_size(af) diff --git a/src/ffmpeg/AVUtil/v52/avutil.jl b/src/ffmpeg/AVUtil/v52/avutil.jl index 9c09ee29..7cce823b 100644 --- a/src/ffmpeg/AVUtil/v52/avutil.jl +++ b/src/ffmpeg/AVUtil/v52/avutil.jl @@ -35,15 +35,15 @@ function av_get_picture_type_char(pict_type::AVPictureType) end function av_x_if_null(p,x) - ccall((:av_x_if_null,libavutil),Ptr{Void},(Ptr{Void},Ptr{Void}),p,x) + ccall((:av_x_if_null,libavutil),Ptr{Cvoid},(Ptr{Cvoid},Ptr{Cvoid}),p,x) end function av_int_list_length_for_size(elsize::Integer,list,term::UInt64) - ccall((:av_int_list_length_for_size,libavutil),UInt32,(UInt32,Ptr{Void},UInt64),elsize,list,term) + ccall((:av_int_list_length_for_size,libavutil),UInt32,(UInt32,Ptr{Cvoid},UInt64),elsize,list,term) end function av_fopen_utf8(path,mode) - ccall((:av_fopen_utf8,libavutil),Ptr{Void},(Ptr{UInt8},Ptr{UInt8}),path,mode) + ccall((:av_fopen_utf8,libavutil),Ptr{Cvoid},(Ptr{UInt8},Ptr{UInt8}),path,mode) end function av_get_time_base_q() diff --git a/src/ffmpeg/AVUtil/v52/buffer.jl b/src/ffmpeg/AVUtil/v52/buffer.jl index 0d8baa02..e3b44938 100644 --- a/src/ffmpeg/AVUtil/v52/buffer.jl +++ b/src/ffmpeg/AVUtil/v52/buffer.jl @@ -28,11 +28,11 @@ function av_buffer_allocz(size::Integer) end function av_buffer_create(data,size::Integer,free,opaque,flags::Integer) - ccall((:av_buffer_create,libavutil),Ptr{AVBufferRef},(Ptr{UInt8},Cint,Ptr{Void},Ptr{Void},Cint),data,size,free,opaque,flags) + ccall((:av_buffer_create,libavutil),Ptr{AVBufferRef},(Ptr{UInt8},Cint,Ptr{Cvoid},Ptr{Cvoid},Cint),data,size,free,opaque,flags) end function av_buffer_default_free(opaque,data) - ccall((:av_buffer_default_free,libavutil),Void,(Ptr{Void},Ptr{UInt8}),opaque,data) + ccall((:av_buffer_default_free,libavutil),Cvoid,(Ptr{Cvoid},Ptr{UInt8}),opaque,data) end function av_buffer_ref(buf) @@ -40,7 +40,7 @@ function av_buffer_ref(buf) end function av_buffer_unref(buf) - ccall((:av_buffer_unref,libavutil),Void,(Ptr{Ptr{AVBufferRef}},),buf) + ccall((:av_buffer_unref,libavutil),Cvoid,(Ptr{Ptr{AVBufferRef}},),buf) end function av_buffer_is_writable(buf) @@ -48,7 +48,7 @@ function av_buffer_is_writable(buf) end function av_buffer_get_opaque(buf) - ccall((:av_buffer_get_opaque,libavutil),Ptr{Void},(Ptr{AVBufferRef},),buf) + ccall((:av_buffer_get_opaque,libavutil),Ptr{Cvoid},(Ptr{AVBufferRef},),buf) end function av_buffer_get_ref_count(buf) @@ -64,11 +64,11 @@ function av_buffer_realloc(buf,size::Integer) end function av_buffer_pool_init(size::Integer,alloc) - ccall((:av_buffer_pool_init,libavutil),Ptr{AVBufferPool},(Cint,Ptr{Void}),size,alloc) + ccall((:av_buffer_pool_init,libavutil),Ptr{AVBufferPool},(Cint,Ptr{Cvoid}),size,alloc) end function av_buffer_pool_uninit(pool) - ccall((:av_buffer_pool_uninit,libavutil),Void,(Ptr{Ptr{AVBufferPool}},),pool) + ccall((:av_buffer_pool_uninit,libavutil),Cvoid,(Ptr{Ptr{AVBufferPool}},),pool) end function av_buffer_pool_get(pool) diff --git a/src/ffmpeg/AVUtil/v52/channel_layout.jl b/src/ffmpeg/AVUtil/v52/channel_layout.jl index 1c3a9745..55a8b092 100644 --- a/src/ffmpeg/AVUtil/v52/channel_layout.jl +++ b/src/ffmpeg/AVUtil/v52/channel_layout.jl @@ -20,11 +20,11 @@ function av_get_channel_layout(name) end function av_get_channel_layout_string(buf,buf_size::Integer,nb_channels::Integer,channel_layout::UInt64) - ccall((:av_get_channel_layout_string,libavutil),Void,(Ptr{UInt8},Cint,Cint,UInt64),buf,buf_size,nb_channels,channel_layout) + ccall((:av_get_channel_layout_string,libavutil),Cvoid,(Ptr{UInt8},Cint,Cint,UInt64),buf,buf_size,nb_channels,channel_layout) end function av_bprint_channel_layout(bp,nb_channels::Integer,channel_layout::UInt64) - ccall((:av_bprint_channel_layout,libavutil),Void,(Ptr{AVBPrint},Cint,UInt64),bp,nb_channels,channel_layout) + ccall((:av_bprint_channel_layout,libavutil),Cvoid,(Ptr{AVBPrint},Cint,UInt64),bp,nb_channels,channel_layout) end function av_get_channel_layout_nb_channels(channel_layout::UInt64) diff --git a/src/ffmpeg/AVUtil/v52/dict.jl b/src/ffmpeg/AVUtil/v52/dict.jl index 03903c72..b654694b 100644 --- a/src/ffmpeg/AVUtil/v52/dict.jl +++ b/src/ffmpeg/AVUtil/v52/dict.jl @@ -28,9 +28,9 @@ function av_dict_parse_string(pm,str,key_val_sep,pairs_sep,flags::Integer) end function av_dict_copy(dst,src,flags::Integer) - ccall((:av_dict_copy,libavutil),Void,(Ptr{Ptr{AVDictionary}},Ptr{AVDictionary},Cint),dst,src,flags) + ccall((:av_dict_copy,libavutil),Cvoid,(Ptr{Ptr{AVDictionary}},Ptr{AVDictionary},Cint),dst,src,flags) end function av_dict_free(m) - ccall((:av_dict_free,libavutil),Void,(Ptr{Ptr{AVDictionary}},),m) + ccall((:av_dict_free,libavutil),Cvoid,(Ptr{Ptr{AVDictionary}},),m) end diff --git a/src/ffmpeg/AVUtil/v52/display.jl b/src/ffmpeg/AVUtil/v52/display.jl index fd8c1186..1c3b2efb 100644 --- a/src/ffmpeg/AVUtil/v52/display.jl +++ b/src/ffmpeg/AVUtil/v52/display.jl @@ -13,9 +13,9 @@ function av_display_rotation_get(matrix) end function av_display_rotation_set(matrix,angle::Cdouble) - ccall((:av_display_rotation_set,libavutil),Void,(Ptr{Int32},Cdouble),matrix,angle) + ccall((:av_display_rotation_set,libavutil),Cvoid,(Ptr{Int32},Cdouble),matrix,angle) end function av_display_matrix_flip(matrix,hflip::Integer,vflip::Integer) - ccall((:av_display_matrix_flip,libavutil),Void,(Ptr{Int32},Cint,Cint),matrix,hflip,vflip) + ccall((:av_display_matrix_flip,libavutil),Cvoid,(Ptr{Int32},Cint,Cint),matrix,hflip,vflip) end diff --git a/src/ffmpeg/AVUtil/v52/fifo.jl b/src/ffmpeg/AVUtil/v52/fifo.jl index a3ef875c..0eb278d5 100644 --- a/src/ffmpeg/AVUtil/v52/fifo.jl +++ b/src/ffmpeg/AVUtil/v52/fifo.jl @@ -27,15 +27,15 @@ function av_fifo_alloc_array(nmemb::Csize_t,size::Csize_t) end function av_fifo_free(f) - ccall((:av_fifo_free,libavutil),Void,(Ptr{AVFifoBuffer},),f) + ccall((:av_fifo_free,libavutil),Cvoid,(Ptr{AVFifoBuffer},),f) end function av_fifo_freep(f) - ccall((:av_fifo_freep,libavutil),Void,(Ptr{Ptr{AVFifoBuffer}},),f) + ccall((:av_fifo_freep,libavutil),Cvoid,(Ptr{Ptr{AVFifoBuffer}},),f) end function av_fifo_reset(f) - ccall((:av_fifo_reset,libavutil),Void,(Ptr{AVFifoBuffer},),f) + ccall((:av_fifo_reset,libavutil),Cvoid,(Ptr{AVFifoBuffer},),f) end function av_fifo_size(f) @@ -47,11 +47,11 @@ function av_fifo_space(f) end function av_fifo_generic_read(f,dest,buf_size::Integer,func) - ccall((:av_fifo_generic_read,libavutil),Cint,(Ptr{AVFifoBuffer},Ptr{Void},Cint,Ptr{Void}),f,dest,buf_size,func) + ccall((:av_fifo_generic_read,libavutil),Cint,(Ptr{AVFifoBuffer},Ptr{Cvoid},Cint,Ptr{Cvoid}),f,dest,buf_size,func) end function av_fifo_generic_write(f,src,size::Integer,func) - ccall((:av_fifo_generic_write,libavutil),Cint,(Ptr{AVFifoBuffer},Ptr{Void},Cint,Ptr{Void}),f,src,size,func) + ccall((:av_fifo_generic_write,libavutil),Cint,(Ptr{AVFifoBuffer},Ptr{Cvoid},Cint,Ptr{Cvoid}),f,src,size,func) end function av_fifo_realloc2(f,size::Integer) @@ -63,7 +63,7 @@ function av_fifo_grow(f,additional_space::Integer) end function av_fifo_drain(f,size::Integer) - ccall((:av_fifo_drain,libavutil),Void,(Ptr{AVFifoBuffer},Cint),f,size) + ccall((:av_fifo_drain,libavutil),Cvoid,(Ptr{AVFifoBuffer},Cint),f,size) end function av_fifo_peek2(f,offs::Integer) diff --git a/src/ffmpeg/AVUtil/v52/file.jl b/src/ffmpeg/AVUtil/v52/file.jl index 78a84856..ff123412 100644 --- a/src/ffmpeg/AVUtil/v52/file.jl +++ b/src/ffmpeg/AVUtil/v52/file.jl @@ -9,13 +9,13 @@ export function av_file_map(filename,bufptr,size,log_offset::Integer,log_ctx) - ccall((:av_file_map,libavutil),Cint,(Ptr{UInt8},Ptr{Ptr{UInt8}},Ptr{Csize_t},Cint,Ptr{Void}),filename,bufptr,size,log_offset,log_ctx) + ccall((:av_file_map,libavutil),Cint,(Ptr{UInt8},Ptr{Ptr{UInt8}},Ptr{Csize_t},Cint,Ptr{Cvoid}),filename,bufptr,size,log_offset,log_ctx) end function av_file_unmap(bufptr,size::Csize_t) - ccall((:av_file_unmap,libavutil),Void,(Ptr{UInt8},Csize_t),bufptr,size) + ccall((:av_file_unmap,libavutil),Cvoid,(Ptr{UInt8},Csize_t),bufptr,size) end function av_tempfile(prefix,filename,log_offset::Integer,log_ctx) - ccall((:av_tempfile,libavutil),Cint,(Ptr{UInt8},Ptr{Ptr{UInt8}},Cint,Ptr{Void}),prefix,filename,log_offset,log_ctx) + ccall((:av_tempfile,libavutil),Cint,(Ptr{UInt8},Ptr{Ptr{UInt8}},Cint,Ptr{Cvoid}),prefix,filename,log_offset,log_ctx) end diff --git a/src/ffmpeg/AVUtil/v52/frame.jl b/src/ffmpeg/AVUtil/v52/frame.jl index a3f65ed9..29e9c3cf 100644 --- a/src/ffmpeg/AVUtil/v52/frame.jl +++ b/src/ffmpeg/AVUtil/v52/frame.jl @@ -51,7 +51,7 @@ function av_frame_get_best_effort_timestamp(frame) end function av_frame_set_best_effort_timestamp(frame,val::Int64) - ccall((:av_frame_set_best_effort_timestamp,libavutil),Void,(Ptr{AVFrame},Int64),frame,val) + ccall((:av_frame_set_best_effort_timestamp,libavutil),Cvoid,(Ptr{AVFrame},Int64),frame,val) end function av_frame_get_pkt_duration(frame) @@ -59,7 +59,7 @@ function av_frame_get_pkt_duration(frame) end function av_frame_set_pkt_duration(frame,val::Int64) - ccall((:av_frame_set_pkt_duration,libavutil),Void,(Ptr{AVFrame},Int64),frame,val) + ccall((:av_frame_set_pkt_duration,libavutil),Cvoid,(Ptr{AVFrame},Int64),frame,val) end function av_frame_get_pkt_pos(frame) @@ -67,7 +67,7 @@ function av_frame_get_pkt_pos(frame) end function av_frame_set_pkt_pos(frame,val::Int64) - ccall((:av_frame_set_pkt_pos,libavutil),Void,(Ptr{AVFrame},Int64),frame,val) + ccall((:av_frame_set_pkt_pos,libavutil),Cvoid,(Ptr{AVFrame},Int64),frame,val) end function av_frame_get_channel_layout(frame) @@ -75,7 +75,7 @@ function av_frame_get_channel_layout(frame) end function av_frame_set_channel_layout(frame,val::Int64) - ccall((:av_frame_set_channel_layout,libavutil),Void,(Ptr{AVFrame},Int64),frame,val) + ccall((:av_frame_set_channel_layout,libavutil),Cvoid,(Ptr{AVFrame},Int64),frame,val) end function av_frame_get_channels(frame) @@ -83,7 +83,7 @@ function av_frame_get_channels(frame) end function av_frame_set_channels(frame,val::Integer) - ccall((:av_frame_set_channels,libavutil),Void,(Ptr{AVFrame},Cint),frame,val) + ccall((:av_frame_set_channels,libavutil),Cvoid,(Ptr{AVFrame},Cint),frame,val) end function av_frame_get_sample_rate(frame) @@ -91,7 +91,7 @@ function av_frame_get_sample_rate(frame) end function av_frame_set_sample_rate(frame,val::Integer) - ccall((:av_frame_set_sample_rate,libavutil),Void,(Ptr{AVFrame},Cint),frame,val) + ccall((:av_frame_set_sample_rate,libavutil),Cvoid,(Ptr{AVFrame},Cint),frame,val) end function av_frame_get_metadata(frame) @@ -99,7 +99,7 @@ function av_frame_get_metadata(frame) end function av_frame_set_metadata(frame,val) - ccall((:av_frame_set_metadata,libavutil),Void,(Ptr{AVFrame},Ptr{AVDictionary}),frame,val) + ccall((:av_frame_set_metadata,libavutil),Cvoid,(Ptr{AVFrame},Ptr{AVDictionary}),frame,val) end function av_frame_get_decode_error_flags(frame) @@ -107,7 +107,7 @@ function av_frame_get_decode_error_flags(frame) end function av_frame_set_decode_error_flags(frame,val::Integer) - ccall((:av_frame_set_decode_error_flags,libavutil),Void,(Ptr{AVFrame},Cint),frame,val) + ccall((:av_frame_set_decode_error_flags,libavutil),Cvoid,(Ptr{AVFrame},Cint),frame,val) end function av_frame_get_pkt_size(frame) @@ -115,7 +115,7 @@ function av_frame_get_pkt_size(frame) end function av_frame_set_pkt_size(frame,val::Integer) - ccall((:av_frame_set_pkt_size,libavutil),Void,(Ptr{AVFrame},Cint),frame,val) + ccall((:av_frame_set_pkt_size,libavutil),Cvoid,(Ptr{AVFrame},Cint),frame,val) end function avpriv_frame_get_metadatap(frame) @@ -135,7 +135,7 @@ function av_frame_get_colorspace(frame) end function av_frame_set_colorspace(frame,val::AVColorSpace) - ccall((:av_frame_set_colorspace,libavutil),Void,(Ptr{AVFrame},AVColorSpace),frame,val) + ccall((:av_frame_set_colorspace,libavutil),Cvoid,(Ptr{AVFrame},AVColorSpace),frame,val) end function av_frame_get_color_range(frame) @@ -143,7 +143,7 @@ function av_frame_get_color_range(frame) end function av_frame_set_color_range(frame,val::AVColorRange) - ccall((:av_frame_set_color_range,libavutil),Void,(Ptr{AVFrame},AVColorRange),frame,val) + ccall((:av_frame_set_color_range,libavutil),Cvoid,(Ptr{AVFrame},AVColorRange),frame,val) end function av_get_colorspace_name(val::AVColorSpace) @@ -155,7 +155,7 @@ function av_frame_alloc() end function av_frame_free(frame) - ccall((:av_frame_free,libavutil),Void,(Ptr{Ptr{AVFrame}},),frame) + ccall((:av_frame_free,libavutil),Cvoid,(Ptr{Ptr{AVFrame}},),frame) end function av_frame_ref(dst,src) @@ -167,11 +167,11 @@ function av_frame_clone(src) end function av_frame_unref(frame) - ccall((:av_frame_unref,libavutil),Void,(Ptr{AVFrame},),frame) + ccall((:av_frame_unref,libavutil),Cvoid,(Ptr{AVFrame},),frame) end function av_frame_move_ref(dst,src) - ccall((:av_frame_move_ref,libavutil),Void,(Ptr{AVFrame},Ptr{AVFrame}),dst,src) + ccall((:av_frame_move_ref,libavutil),Cvoid,(Ptr{AVFrame},Ptr{AVFrame}),dst,src) end function av_frame_get_buffer(frame,align::Integer) @@ -207,5 +207,5 @@ function av_frame_get_side_data(frame,_type::AVFrameSideDataType) end function av_frame_remove_side_data(frame,_type::AVFrameSideDataType) - ccall((:av_frame_remove_side_data,libavutil),Void,(Ptr{AVFrame},AVFrameSideDataType),frame,_type) + ccall((:av_frame_remove_side_data,libavutil),Cvoid,(Ptr{AVFrame},AVFrameSideDataType),frame,_type) end diff --git a/src/ffmpeg/AVUtil/v52/hash.jl b/src/ffmpeg/AVUtil/v52/hash.jl index 2270550e..1691763f 100644 --- a/src/ffmpeg/AVUtil/v52/hash.jl +++ b/src/ffmpeg/AVUtil/v52/hash.jl @@ -33,29 +33,29 @@ function av_hash_get_size(ctx) end function av_hash_init(ctx) - ccall((:av_hash_init,libavutil),Void,(Ptr{AVHashContext},),ctx) + ccall((:av_hash_init,libavutil),Cvoid,(Ptr{AVHashContext},),ctx) end function av_hash_update(ctx,src,len::Integer) - ccall((:av_hash_update,libavutil),Void,(Ptr{AVHashContext},Ptr{UInt8},Cint),ctx,src,len) + ccall((:av_hash_update,libavutil),Cvoid,(Ptr{AVHashContext},Ptr{UInt8},Cint),ctx,src,len) end function av_hash_final(ctx,dst) - ccall((:av_hash_final,libavutil),Void,(Ptr{AVHashContext},Ptr{UInt8}),ctx,dst) + ccall((:av_hash_final,libavutil),Cvoid,(Ptr{AVHashContext},Ptr{UInt8}),ctx,dst) end function av_hash_final_bin(ctx,dst,size::Integer) - ccall((:av_hash_final_bin,libavutil),Void,(Ptr{AVHashContext},Ptr{UInt8},Cint),ctx,dst,size) + ccall((:av_hash_final_bin,libavutil),Cvoid,(Ptr{AVHashContext},Ptr{UInt8},Cint),ctx,dst,size) end function av_hash_final_hex(ctx,dst,size::Integer) - ccall((:av_hash_final_hex,libavutil),Void,(Ptr{AVHashContext},Ptr{UInt8},Cint),ctx,dst,size) + ccall((:av_hash_final_hex,libavutil),Cvoid,(Ptr{AVHashContext},Ptr{UInt8},Cint),ctx,dst,size) end function av_hash_final_b64(ctx,dst,size::Integer) - ccall((:av_hash_final_b64,libavutil),Void,(Ptr{AVHashContext},Ptr{UInt8},Cint),ctx,dst,size) + ccall((:av_hash_final_b64,libavutil),Cvoid,(Ptr{AVHashContext},Ptr{UInt8},Cint),ctx,dst,size) end function av_hash_freep(ctx) - ccall((:av_hash_freep,libavutil),Void,(Ptr{Ptr{AVHashContext}},),ctx) + ccall((:av_hash_freep,libavutil),Cvoid,(Ptr{Ptr{AVHashContext}},),ctx) end diff --git a/src/ffmpeg/AVUtil/v52/imgutils.jl b/src/ffmpeg/AVUtil/v52/imgutils.jl index e195f0fe..47ecd93f 100644 --- a/src/ffmpeg/AVUtil/v52/imgutils.jl +++ b/src/ffmpeg/AVUtil/v52/imgutils.jl @@ -19,7 +19,7 @@ export function av_image_fill_max_pixsteps(max_pixsteps,max_pixstep_comps,pixdesc) - ccall((:av_image_fill_max_pixsteps,libavutil),Void,(Ptr{Cint},Ptr{Cint},Ptr{AVPixFmtDescriptor}),max_pixsteps,max_pixstep_comps,pixdesc) + ccall((:av_image_fill_max_pixsteps,libavutil),Cvoid,(Ptr{Cint},Ptr{Cint},Ptr{AVPixFmtDescriptor}),max_pixsteps,max_pixstep_comps,pixdesc) end function av_image_get_linesize(pix_fmt::AVPixelFormat,width::Integer,plane::Integer) @@ -39,11 +39,11 @@ function av_image_alloc(pointers,linesizes,w::Integer,h::Integer,pix_fmt::AVPixe end function av_image_copy_plane(dst,dst_linesize::Integer,src,src_linesize::Integer,bytewidth::Integer,height::Integer) - ccall((:av_image_copy_plane,libavutil),Void,(Ptr{UInt8},Cint,Ptr{UInt8},Cint,Cint,Cint),dst,dst_linesize,src,src_linesize,bytewidth,height) + ccall((:av_image_copy_plane,libavutil),Cvoid,(Ptr{UInt8},Cint,Ptr{UInt8},Cint,Cint,Cint),dst,dst_linesize,src,src_linesize,bytewidth,height) end function av_image_copy(dst_data,dst_linesizes,src_data,src_linesizes,pix_fmt::AVPixelFormat,width::Integer,height::Integer) - ccall((:av_image_copy,libavutil),Void,(Ptr{Ptr{UInt8}},Ptr{Cint},Ptr{Ptr{UInt8}},Ptr{Cint},AVPixelFormat,Cint,Cint),dst_data,dst_linesizes,src_data,src_linesizes,pix_fmt,width,height) + ccall((:av_image_copy,libavutil),Cvoid,(Ptr{Ptr{UInt8}},Ptr{Cint},Ptr{Ptr{UInt8}},Ptr{Cint},AVPixelFormat,Cint,Cint),dst_data,dst_linesizes,src_data,src_linesizes,pix_fmt,width,height) end function av_image_fill_arrays(dst_data,dst_linesize,src,pix_fmt::AVPixelFormat,width::Integer,height::Integer,align::Integer) @@ -59,7 +59,7 @@ function av_image_copy_to_buffer(dst,dst_size::Integer,src_data,src_linesize,pix end function av_image_check_size(w::Integer,h::Integer,log_offset::Integer,log_ctx) - ccall((:av_image_check_size,libavutil),Cint,(UInt32,UInt32,Cint,Ptr{Void}),w,h,log_offset,log_ctx) + ccall((:av_image_check_size,libavutil),Cint,(UInt32,UInt32,Cint,Ptr{Cvoid}),w,h,log_offset,log_ctx) end function av_image_check_sar(w::Integer,h::Integer,sar::AVRational) diff --git a/src/ffmpeg/AVUtil/v52/libavutil_h.jl b/src/ffmpeg/AVUtil/v52/libavutil_h.jl index d91d69ab..9d8b31e5 100644 --- a/src/ffmpeg/AVUtil/v52/libavutil_h.jl +++ b/src/ffmpeg/AVUtil/v52/libavutil_h.jl @@ -699,7 +699,7 @@ const AV_PICTURE_TYPE_BI = UInt32(7) const AV_BUFFER_FLAG_READONLY = 1 << 0 -const AVBuffer = Void +const AVBuffer = Nothing struct AVBufferRef buffer::Ptr{AVBuffer} @@ -707,7 +707,7 @@ struct AVBufferRef size::Cint end -const AVBufferPool = Void +const AVBufferPool = Nothing const AV_CH_FRONT_LEFT = 0x00000001 const AV_CH_FRONT_RIGHT = 0x00000002 @@ -775,7 +775,7 @@ const AV_MATRIX_ENCODING_DOLBYHEADPHONE = UInt32(6) const AV_MATRIX_ENCODING_NB = UInt32(7) # end enum AVMatrixEncoding -const AVBPrint = Void +const AVBPrint = Nothing const AV_DICT_MATCH_CASE = 1 const AV_DICT_IGNORE_SUFFIX = 2 @@ -789,7 +789,7 @@ struct AVDictionaryEntry value::Ptr{UInt8} end -const AVDictionary = Void +const AVDictionary = Nothing struct AVFifoBuffer buffer::Ptr{UInt8} @@ -850,8 +850,8 @@ end zero(::Type{Array_8_Cint}) = Array_8_Cint(fill(zero(Cint),8)...) struct Array_2_Ptr - d1::Ptr{Void} - d2::Ptr{Void} + d1::Ptr{Cvoid} + d2::Ptr{Cvoid} end zero(::Type{Array_2_Ptr}) = Array_2_Ptr(fill(C_NULL,2)...) @@ -966,7 +966,7 @@ struct AVFrame mb_type::Ptr{UInt32} dct_coeff::Ptr{Int16} ref_index::Array_2_Ptr - opaque::Ptr{Void} + opaque::Ptr{Cvoid} error::Array_8_Uint64 _type::Cint repeat_pict::Cint @@ -974,11 +974,11 @@ struct AVFrame top_field_first::Cint palette_has_changed::Cint buffer_hints::Cint - pan_scan::Ptr{Void} # Ptr{AVPanScan} + pan_scan::Ptr{Cvoid} # Ptr{AVPanScan} reordered_opaque::Int64 - hwaccel_picture_private::Ptr{Void} - owner::Ptr{Void} #Ptr{AVCodecContext} - thread_opaque::Ptr{Void} + hwaccel_picture_private::Ptr{Cvoid} + owner::Ptr{Cvoid} #Ptr{AVCodecContext} + thread_opaque::Ptr{Cvoid} motion_subsample_log2::UInt8 sample_rate::Cint channel_layout::UInt64 @@ -1112,7 +1112,7 @@ struct AVOption help::Ptr{UInt8} offset::Cint _type::AVOptionType - default_val::Void + default_val::Nothing min::Cdouble max::Cdouble flags::Cint @@ -1121,16 +1121,16 @@ end struct AVClass class_name::Ptr{UInt8} - item_name::Ptr{Void} + item_name::Ptr{Cvoid} option::Ptr{AVOption} version::Cint log_level_offset_offset::Cint parent_log_context_offset::Cint - child_next::Ptr{Void} - child_class_next::Ptr{Void} + child_next::Ptr{Cvoid} + child_class_next::Ptr{Cvoid} category::AVClassCategory - get_category::Ptr{Void} - query_ranges::Ptr{Void} + get_category::Ptr{Cvoid} + query_ranges::Ptr{Cvoid} end # Skipping MacroDefinition: DECLARE_ALIGNED ( n , t , v ) t __attribute__ ( ( aligned ( n ) ) ) v @@ -1634,7 +1634,7 @@ const LIBAVUTIL_VERSION_MICRO = 100 # Skipping MacroDefinition: FF_API_OPT_TYPE_METADATA ( LIBAVUTIL_VERSION_MAJOR < 54 ) # Skipping MacroDefinition: FF_API_AVFRAME_COLORSPACE ( LIBAVUTIL_VERSION_MAJOR >= 52 ) -const AVAudioFifo = Void +const AVAudioFifo = Nothing # begin enum AVDownmixType const AVDownmixType = UInt32 @@ -1656,7 +1656,7 @@ end const AV_HASH_MAX_SIZE = 64 -const AVHashContext = Void +const AVHashContext = Nothing const AV_OPT_FLAG_ENCODING_PARAM = 1 const AV_OPT_FLAG_DECODING_PARAM = 2 @@ -1704,7 +1704,7 @@ struct AVStereo3D flags::Cint end -const AVThreadMessageQueue = Void +const AVThreadMessageQueue = Nothing # begin enum AVThreadMessageFlags const AVThreadMessageFlags = UInt32 diff --git a/src/ffmpeg/AVUtil/v52/log.jl b/src/ffmpeg/AVUtil/v52/log.jl index 025a9db2..e99f9d12 100644 --- a/src/ffmpeg/AVUtil/v52/log.jl +++ b/src/ffmpeg/AVUtil/v52/log.jl @@ -24,11 +24,11 @@ function av_log_get_level() end function av_log_set_level(level::Integer) - ccall((:av_log_set_level,libavutil),Void,(Cint,),level) + ccall((:av_log_set_level,libavutil),Cvoid,(Cint,),level) end function av_log_set_callback(callback) - ccall((:av_log_set_callback,libavutil),Void,(Ptr{Void},),callback) + ccall((:av_log_set_callback,libavutil),Cvoid,(Ptr{Cvoid},),callback) end # function av_log_default_callback(avcl,level::Integer,fmt,vl) @@ -36,11 +36,11 @@ end # end function av_default_item_name(ctx) - ccall((:av_default_item_name,libavutil),Ptr{UInt8},(Ptr{Void},),ctx) + ccall((:av_default_item_name,libavutil),Ptr{UInt8},(Ptr{Cvoid},),ctx) end function av_default_get_category(ptr) - ccall((:av_default_get_category,libavutil),AVClassCategory,(Ptr{Void},),ptr) + ccall((:av_default_get_category,libavutil),AVClassCategory,(Ptr{Cvoid},),ptr) end # function av_log_format_line(ptr,level::Integer,fmt,vl,line,line_size::Integer,print_prefix) @@ -48,7 +48,7 @@ end # end function av_log_set_flags(arg::Integer) - ccall((:av_log_set_flags,libavutil),Void,(Cint,),arg) + ccall((:av_log_set_flags,libavutil),Cvoid,(Cint,),arg) end function av_log_get_flags() diff --git a/src/ffmpeg/AVUtil/v52/mem.jl b/src/ffmpeg/AVUtil/v52/mem.jl index 003e875d..3f32b8a2 100644 --- a/src/ffmpeg/AVUtil/v52/mem.jl +++ b/src/ffmpeg/AVUtil/v52/mem.jl @@ -28,47 +28,47 @@ export function av_malloc(size::Csize_t) - ccall((:av_malloc,libavutil),Ptr{Void},(Csize_t,),size) + ccall((:av_malloc,libavutil),Ptr{Cvoid},(Csize_t,),size) end function av_malloc_array(nmemb::Csize_t,size::Csize_t) - ccall((:av_malloc_array,libavutil),Ptr{Void},(Csize_t,Csize_t),nmemb,size) + ccall((:av_malloc_array,libavutil),Ptr{Cvoid},(Csize_t,Csize_t),nmemb,size) end function av_realloc(ptr,size::Csize_t) - ccall((:av_realloc,libavutil),Ptr{Void},(Ptr{Void},Csize_t),ptr,size) + ccall((:av_realloc,libavutil),Ptr{Cvoid},(Ptr{Cvoid},Csize_t),ptr,size) end function av_realloc_f(ptr,nelem::Csize_t,elsize::Csize_t) - ccall((:av_realloc_f,libavutil),Ptr{Void},(Ptr{Void},Csize_t,Csize_t),ptr,nelem,elsize) + ccall((:av_realloc_f,libavutil),Ptr{Cvoid},(Ptr{Cvoid},Csize_t,Csize_t),ptr,nelem,elsize) end function av_reallocp(ptr,size::Csize_t) - ccall((:av_reallocp,libavutil),Cint,(Ptr{Void},Csize_t),ptr,size) + ccall((:av_reallocp,libavutil),Cint,(Ptr{Cvoid},Csize_t),ptr,size) end function av_realloc_array(ptr,nmemb::Csize_t,size::Csize_t) - ccall((:av_realloc_array,libavutil),Ptr{Void},(Ptr{Void},Csize_t,Csize_t),ptr,nmemb,size) + ccall((:av_realloc_array,libavutil),Ptr{Cvoid},(Ptr{Cvoid},Csize_t,Csize_t),ptr,nmemb,size) end function av_reallocp_array(ptr,nmemb::Csize_t,size::Csize_t) - ccall((:av_reallocp_array,libavutil),Cint,(Ptr{Void},Csize_t,Csize_t),ptr,nmemb,size) + ccall((:av_reallocp_array,libavutil),Cint,(Ptr{Cvoid},Csize_t,Csize_t),ptr,nmemb,size) end function av_free(ptr) - ccall((:av_free,libavutil),Void,(Ptr{Void},),ptr) + ccall((:av_free,libavutil),Cvoid,(Ptr{Cvoid},),ptr) end function av_mallocz(size::Csize_t) - ccall((:av_mallocz,libavutil),Ptr{Void},(Csize_t,),size) + ccall((:av_mallocz,libavutil),Ptr{Cvoid},(Csize_t,),size) end function av_calloc(nmemb::Csize_t,size::Csize_t) - ccall((:av_calloc,libavutil),Ptr{Void},(Csize_t,Csize_t),nmemb,size) + ccall((:av_calloc,libavutil),Ptr{Cvoid},(Csize_t,Csize_t),nmemb,size) end function av_mallocz_array(nmemb::Csize_t,size::Csize_t) - ccall((:av_mallocz_array,libavutil),Ptr{Void},(Csize_t,Csize_t),nmemb,size) + ccall((:av_mallocz_array,libavutil),Ptr{Cvoid},(Csize_t,Csize_t),nmemb,size) end function av_strdup(s) @@ -76,23 +76,23 @@ function av_strdup(s) end function av_memdup(p,size::Csize_t) - ccall((:av_memdup,libavutil),Ptr{Void},(Ptr{Void},Csize_t),p,size) + ccall((:av_memdup,libavutil),Ptr{Cvoid},(Ptr{Cvoid},Csize_t),p,size) end function av_freep(ptr) - ccall((:av_freep,libavutil),Void,(Ptr{Void},),ptr) + ccall((:av_freep,libavutil),Cvoid,(Ptr{Cvoid},),ptr) end function av_dynarray_add(tab_ptr,nb_ptr,elem) - ccall((:av_dynarray_add,libavutil),Void,(Ptr{Void},Ptr{Cint},Ptr{Void}),tab_ptr,nb_ptr,elem) + ccall((:av_dynarray_add,libavutil),Cvoid,(Ptr{Cvoid},Ptr{Cint},Ptr{Cvoid}),tab_ptr,nb_ptr,elem) end function av_dynarray_add_nofree(tab_ptr,nb_ptr,elem) - ccall((:av_dynarray_add_nofree,libavutil),Cint,(Ptr{Void},Ptr{Cint},Ptr{Void}),tab_ptr,nb_ptr,elem) + ccall((:av_dynarray_add_nofree,libavutil),Cint,(Ptr{Cvoid},Ptr{Cint},Ptr{Cvoid}),tab_ptr,nb_ptr,elem) end function av_dynarray2_add(tab_ptr,nb_ptr,elem_size::Csize_t,elem_data) - ccall((:av_dynarray2_add,libavutil),Ptr{Void},(Ptr{Ptr{Void}},Ptr{Cint},Csize_t,Ptr{UInt8}),tab_ptr,nb_ptr,elem_size,elem_data) + ccall((:av_dynarray2_add,libavutil),Ptr{Cvoid},(Ptr{Ptr{Cvoid}},Ptr{Cint},Csize_t,Ptr{UInt8}),tab_ptr,nb_ptr,elem_size,elem_data) end function av_size_mult(a::Csize_t,b::Csize_t,r) @@ -100,17 +100,17 @@ function av_size_mult(a::Csize_t,b::Csize_t,r) end function av_max_alloc(max::Csize_t) - ccall((:av_max_alloc,libavutil),Void,(Csize_t,),max) + ccall((:av_max_alloc,libavutil),Cvoid,(Csize_t,),max) end function av_memcpy_backptr(dst,back::Integer,cnt::Integer) - ccall((:av_memcpy_backptr,libavutil),Void,(Ptr{UInt8},Cint,Cint),dst,back,cnt) + ccall((:av_memcpy_backptr,libavutil),Cvoid,(Ptr{UInt8},Cint,Cint),dst,back,cnt) end function av_fast_realloc(ptr,size,min_size::Csize_t) - ccall((:av_fast_realloc,libavutil),Ptr{Void},(Ptr{Void},Ptr{UInt32},Csize_t),ptr,size,min_size) + ccall((:av_fast_realloc,libavutil),Ptr{Cvoid},(Ptr{Cvoid},Ptr{UInt32},Csize_t),ptr,size,min_size) end function av_fast_malloc(ptr,size,min_size::Csize_t) - ccall((:av_fast_malloc,libavutil),Void,(Ptr{Void},Ptr{UInt32},Csize_t),ptr,size,min_size) + ccall((:av_fast_malloc,libavutil),Cvoid,(Ptr{Cvoid},Ptr{UInt32},Csize_t),ptr,size,min_size) end diff --git a/src/ffmpeg/AVUtil/v52/opt.jl b/src/ffmpeg/AVUtil/v52/opt.jl index 26b0dbbc..0cd0655e 100644 --- a/src/ffmpeg/AVUtil/v52/opt.jl +++ b/src/ffmpeg/AVUtil/v52/opt.jl @@ -61,79 +61,79 @@ export function av_find_opt(obj,name,unit,mask::Integer,flags::Integer) - ccall((:av_find_opt,libavutil),Ptr{AVOption},(Ptr{Void},Ptr{UInt8},Ptr{UInt8},Cint,Cint),obj,name,unit,mask,flags) + ccall((:av_find_opt,libavutil),Ptr{AVOption},(Ptr{Cvoid},Ptr{UInt8},Ptr{UInt8},Cint,Cint),obj,name,unit,mask,flags) end function av_set_string3(obj,name,val,alloc::Integer,o_out) - ccall((:av_set_string3,libavutil),Cint,(Ptr{Void},Ptr{UInt8},Ptr{UInt8},Cint,Ptr{Ptr{AVOption}}),obj,name,val,alloc,o_out) + ccall((:av_set_string3,libavutil),Cint,(Ptr{Cvoid},Ptr{UInt8},Ptr{UInt8},Cint,Ptr{Ptr{AVOption}}),obj,name,val,alloc,o_out) end function av_set_double(obj,name,n::Cdouble) - ccall((:av_set_double,libavutil),Ptr{AVOption},(Ptr{Void},Ptr{UInt8},Cdouble),obj,name,n) + ccall((:av_set_double,libavutil),Ptr{AVOption},(Ptr{Cvoid},Ptr{UInt8},Cdouble),obj,name,n) end function av_set_q(obj,name,n::AVRational) - ccall((:av_set_q,libavutil),Ptr{AVOption},(Ptr{Void},Ptr{UInt8},AVRational),obj,name,n) + ccall((:av_set_q,libavutil),Ptr{AVOption},(Ptr{Cvoid},Ptr{UInt8},AVRational),obj,name,n) end function av_set_int(obj,name,n::Int64) - ccall((:av_set_int,libavutil),Ptr{AVOption},(Ptr{Void},Ptr{UInt8},Int64),obj,name,n) + ccall((:av_set_int,libavutil),Ptr{AVOption},(Ptr{Cvoid},Ptr{UInt8},Int64),obj,name,n) end function av_get_double(obj,name,o_out) - ccall((:av_get_double,libavutil),Cdouble,(Ptr{Void},Ptr{UInt8},Ptr{Ptr{AVOption}}),obj,name,o_out) + ccall((:av_get_double,libavutil),Cdouble,(Ptr{Cvoid},Ptr{UInt8},Ptr{Ptr{AVOption}}),obj,name,o_out) end function av_get_q(obj,name,o_out) - ccall((:av_get_q,libavutil),AVRational,(Ptr{Void},Ptr{UInt8},Ptr{Ptr{AVOption}}),obj,name,o_out) + ccall((:av_get_q,libavutil),AVRational,(Ptr{Cvoid},Ptr{UInt8},Ptr{Ptr{AVOption}}),obj,name,o_out) end function av_get_int(obj,name,o_out) - ccall((:av_get_int,libavutil),Int64,(Ptr{Void},Ptr{UInt8},Ptr{Ptr{AVOption}}),obj,name,o_out) + ccall((:av_get_int,libavutil),Int64,(Ptr{Cvoid},Ptr{UInt8},Ptr{Ptr{AVOption}}),obj,name,o_out) end function av_get_string(obj,name,o_out,buf,buf_len::Integer) - ccall((:av_get_string,libavutil),Ptr{UInt8},(Ptr{Void},Ptr{UInt8},Ptr{Ptr{AVOption}},Ptr{UInt8},Cint),obj,name,o_out,buf,buf_len) + ccall((:av_get_string,libavutil),Ptr{UInt8},(Ptr{Cvoid},Ptr{UInt8},Ptr{Ptr{AVOption}},Ptr{UInt8},Cint),obj,name,o_out,buf,buf_len) end function av_next_option(obj,last) - ccall((:av_next_option,libavutil),Ptr{AVOption},(Ptr{Void},Ptr{AVOption}),obj,last) + ccall((:av_next_option,libavutil),Ptr{AVOption},(Ptr{Cvoid},Ptr{AVOption}),obj,last) end function av_opt_show2(obj,av_log_obj,req_flags::Integer,rej_flags::Integer) - ccall((:av_opt_show2,libavutil),Cint,(Ptr{Void},Ptr{Void},Cint,Cint),obj,av_log_obj,req_flags,rej_flags) + ccall((:av_opt_show2,libavutil),Cint,(Ptr{Cvoid},Ptr{Cvoid},Cint,Cint),obj,av_log_obj,req_flags,rej_flags) end function av_opt_set_defaults(s) - ccall((:av_opt_set_defaults,libavutil),Void,(Ptr{Void},),s) + ccall((:av_opt_set_defaults,libavutil),Cvoid,(Ptr{Cvoid},),s) end function av_opt_set_defaults2(s,mask::Integer,flags::Integer) - ccall((:av_opt_set_defaults2,libavutil),Void,(Ptr{Void},Cint,Cint),s,mask,flags) + ccall((:av_opt_set_defaults2,libavutil),Cvoid,(Ptr{Cvoid},Cint,Cint),s,mask,flags) end function av_set_options_string(ctx,opts,key_val_sep,pairs_sep) - ccall((:av_set_options_string,libavutil),Cint,(Ptr{Void},Ptr{UInt8},Ptr{UInt8},Ptr{UInt8}),ctx,opts,key_val_sep,pairs_sep) + ccall((:av_set_options_string,libavutil),Cint,(Ptr{Cvoid},Ptr{UInt8},Ptr{UInt8},Ptr{UInt8}),ctx,opts,key_val_sep,pairs_sep) end function av_opt_set_from_string(ctx,opts,shorthand,key_val_sep,pairs_sep) - ccall((:av_opt_set_from_string,libavutil),Cint,(Ptr{Void},Ptr{UInt8},Ptr{Ptr{UInt8}},Ptr{UInt8},Ptr{UInt8}),ctx,opts,shorthand,key_val_sep,pairs_sep) + ccall((:av_opt_set_from_string,libavutil),Cint,(Ptr{Cvoid},Ptr{UInt8},Ptr{Ptr{UInt8}},Ptr{UInt8},Ptr{UInt8}),ctx,opts,shorthand,key_val_sep,pairs_sep) end function av_opt_free(obj) - ccall((:av_opt_free,libavutil),Void,(Ptr{Void},),obj) + ccall((:av_opt_free,libavutil),Cvoid,(Ptr{Cvoid},),obj) end function av_opt_flag_is_set(obj,field_name,flag_name) - ccall((:av_opt_flag_is_set,libavutil),Cint,(Ptr{Void},Ptr{UInt8},Ptr{UInt8}),obj,field_name,flag_name) + ccall((:av_opt_flag_is_set,libavutil),Cint,(Ptr{Cvoid},Ptr{UInt8},Ptr{UInt8}),obj,field_name,flag_name) end function av_opt_set_dict(obj,options) - ccall((:av_opt_set_dict,libavutil),Cint,(Ptr{Void},Ptr{Ptr{AVDictionary}}),obj,options) + ccall((:av_opt_set_dict,libavutil),Cint,(Ptr{Cvoid},Ptr{Ptr{AVDictionary}}),obj,options) end function av_opt_set_dict2(obj,options,search_flags::Integer) - ccall((:av_opt_set_dict2,libavutil),Cint,(Ptr{Void},Ptr{Ptr{AVDictionary}},Cint),obj,options,search_flags) + ccall((:av_opt_set_dict2,libavutil),Cint,(Ptr{Cvoid},Ptr{Ptr{AVDictionary}},Cint),obj,options,search_flags) end function av_opt_get_key_value(ropts,key_val_sep,pairs_sep,flags::Integer,rkey,rval) @@ -141,43 +141,43 @@ function av_opt_get_key_value(ropts,key_val_sep,pairs_sep,flags::Integer,rkey,rv end function av_opt_eval_flags(obj,o,val,flags_out) - ccall((:av_opt_eval_flags,libavutil),Cint,(Ptr{Void},Ptr{AVOption},Ptr{UInt8},Ptr{Cint}),obj,o,val,flags_out) + ccall((:av_opt_eval_flags,libavutil),Cint,(Ptr{Cvoid},Ptr{AVOption},Ptr{UInt8},Ptr{Cint}),obj,o,val,flags_out) end function av_opt_eval_int(obj,o,val,int_out) - ccall((:av_opt_eval_int,libavutil),Cint,(Ptr{Void},Ptr{AVOption},Ptr{UInt8},Ptr{Cint}),obj,o,val,int_out) + ccall((:av_opt_eval_int,libavutil),Cint,(Ptr{Cvoid},Ptr{AVOption},Ptr{UInt8},Ptr{Cint}),obj,o,val,int_out) end function av_opt_eval_int64(obj,o,val,int64_out) - ccall((:av_opt_eval_int64,libavutil),Cint,(Ptr{Void},Ptr{AVOption},Ptr{UInt8},Ptr{Int64}),obj,o,val,int64_out) + ccall((:av_opt_eval_int64,libavutil),Cint,(Ptr{Cvoid},Ptr{AVOption},Ptr{UInt8},Ptr{Int64}),obj,o,val,int64_out) end function av_opt_eval_float(obj,o,val,float_out) - ccall((:av_opt_eval_float,libavutil),Cint,(Ptr{Void},Ptr{AVOption},Ptr{UInt8},Ptr{Cfloat}),obj,o,val,float_out) + ccall((:av_opt_eval_float,libavutil),Cint,(Ptr{Cvoid},Ptr{AVOption},Ptr{UInt8},Ptr{Cfloat}),obj,o,val,float_out) end function av_opt_eval_double(obj,o,val,double_out) - ccall((:av_opt_eval_double,libavutil),Cint,(Ptr{Void},Ptr{AVOption},Ptr{UInt8},Ptr{Cdouble}),obj,o,val,double_out) + ccall((:av_opt_eval_double,libavutil),Cint,(Ptr{Cvoid},Ptr{AVOption},Ptr{UInt8},Ptr{Cdouble}),obj,o,val,double_out) end function av_opt_eval_q(obj,o,val,q_out) - ccall((:av_opt_eval_q,libavutil),Cint,(Ptr{Void},Ptr{AVOption},Ptr{UInt8},Ptr{AVRational}),obj,o,val,q_out) + ccall((:av_opt_eval_q,libavutil),Cint,(Ptr{Cvoid},Ptr{AVOption},Ptr{UInt8},Ptr{AVRational}),obj,o,val,q_out) end function av_opt_find(obj,name,unit,opt_flags::Integer,search_flags::Integer) - ccall((:av_opt_find,libavutil),Ptr{AVOption},(Ptr{Void},Ptr{UInt8},Ptr{UInt8},Cint,Cint),obj,name,unit,opt_flags,search_flags) + ccall((:av_opt_find,libavutil),Ptr{AVOption},(Ptr{Cvoid},Ptr{UInt8},Ptr{UInt8},Cint,Cint),obj,name,unit,opt_flags,search_flags) end function av_opt_find2(obj,name,unit,opt_flags::Integer,search_flags::Integer,target_obj) - ccall((:av_opt_find2,libavutil),Ptr{AVOption},(Ptr{Void},Ptr{UInt8},Ptr{UInt8},Cint,Cint,Ptr{Ptr{Void}}),obj,name,unit,opt_flags,search_flags,target_obj) + ccall((:av_opt_find2,libavutil),Ptr{AVOption},(Ptr{Cvoid},Ptr{UInt8},Ptr{UInt8},Cint,Cint,Ptr{Ptr{Cvoid}}),obj,name,unit,opt_flags,search_flags,target_obj) end function av_opt_next(obj,prev) - ccall((:av_opt_next,libavutil),Ptr{AVOption},(Ptr{Void},Ptr{AVOption}),obj,prev) + ccall((:av_opt_next,libavutil),Ptr{AVOption},(Ptr{Cvoid},Ptr{AVOption}),obj,prev) end function av_opt_child_next(obj,prev) - ccall((:av_opt_child_next,libavutil),Ptr{Void},(Ptr{Void},Ptr{Void}),obj,prev) + ccall((:av_opt_child_next,libavutil),Ptr{Cvoid},(Ptr{Cvoid},Ptr{Cvoid}),obj,prev) end function av_opt_child_class_next(parent,prev) @@ -185,97 +185,97 @@ function av_opt_child_class_next(parent,prev) end function av_opt_set(obj,name,val,search_flags::Integer) - ccall((:av_opt_set,libavutil),Cint,(Ptr{Void},Ptr{UInt8},Ptr{UInt8},Cint),obj,name,val,search_flags) + ccall((:av_opt_set,libavutil),Cint,(Ptr{Cvoid},Ptr{UInt8},Ptr{UInt8},Cint),obj,name,val,search_flags) end function av_opt_set_int(obj,name,val::Int64,search_flags::Integer) - ccall((:av_opt_set_int,libavutil),Cint,(Ptr{Void},Ptr{UInt8},Int64,Cint),obj,name,val,search_flags) + ccall((:av_opt_set_int,libavutil),Cint,(Ptr{Cvoid},Ptr{UInt8},Int64,Cint),obj,name,val,search_flags) end function av_opt_set_double(obj,name,val::Cdouble,search_flags::Integer) - ccall((:av_opt_set_double,libavutil),Cint,(Ptr{Void},Ptr{UInt8},Cdouble,Cint),obj,name,val,search_flags) + ccall((:av_opt_set_double,libavutil),Cint,(Ptr{Cvoid},Ptr{UInt8},Cdouble,Cint),obj,name,val,search_flags) end function av_opt_set_q(obj,name,val::AVRational,search_flags::Integer) - ccall((:av_opt_set_q,libavutil),Cint,(Ptr{Void},Ptr{UInt8},AVRational,Cint),obj,name,val,search_flags) + ccall((:av_opt_set_q,libavutil),Cint,(Ptr{Cvoid},Ptr{UInt8},AVRational,Cint),obj,name,val,search_flags) end function av_opt_set_bin(obj,name,val,size::Integer,search_flags::Integer) - ccall((:av_opt_set_bin,libavutil),Cint,(Ptr{Void},Ptr{UInt8},Ptr{UInt8},Cint,Cint),obj,name,val,size,search_flags) + ccall((:av_opt_set_bin,libavutil),Cint,(Ptr{Cvoid},Ptr{UInt8},Ptr{UInt8},Cint,Cint),obj,name,val,size,search_flags) end function av_opt_set_image_size(obj,name,w::Integer,h::Integer,search_flags::Integer) - ccall((:av_opt_set_image_size,libavutil),Cint,(Ptr{Void},Ptr{UInt8},Cint,Cint,Cint),obj,name,w,h,search_flags) + ccall((:av_opt_set_image_size,libavutil),Cint,(Ptr{Cvoid},Ptr{UInt8},Cint,Cint,Cint),obj,name,w,h,search_flags) end function av_opt_set_pixel_fmt(obj,name,fmt::AVPixelFormat,search_flags::Integer) - ccall((:av_opt_set_pixel_fmt,libavutil),Cint,(Ptr{Void},Ptr{UInt8},AVPixelFormat,Cint),obj,name,fmt,search_flags) + ccall((:av_opt_set_pixel_fmt,libavutil),Cint,(Ptr{Cvoid},Ptr{UInt8},AVPixelFormat,Cint),obj,name,fmt,search_flags) end function av_opt_set_sample_fmt(obj,name,fmt::AVSampleFormat,search_flags::Integer) - ccall((:av_opt_set_sample_fmt,libavutil),Cint,(Ptr{Void},Ptr{UInt8},AVSampleFormat,Cint),obj,name,fmt,search_flags) + ccall((:av_opt_set_sample_fmt,libavutil),Cint,(Ptr{Cvoid},Ptr{UInt8},AVSampleFormat,Cint),obj,name,fmt,search_flags) end function av_opt_set_video_rate(obj,name,val::AVRational,search_flags::Integer) - ccall((:av_opt_set_video_rate,libavutil),Cint,(Ptr{Void},Ptr{UInt8},AVRational,Cint),obj,name,val,search_flags) + ccall((:av_opt_set_video_rate,libavutil),Cint,(Ptr{Cvoid},Ptr{UInt8},AVRational,Cint),obj,name,val,search_flags) end function av_opt_set_channel_layout(obj,name,ch_layout::Int64,search_flags::Integer) - ccall((:av_opt_set_channel_layout,libavutil),Cint,(Ptr{Void},Ptr{UInt8},Int64,Cint),obj,name,ch_layout,search_flags) + ccall((:av_opt_set_channel_layout,libavutil),Cint,(Ptr{Cvoid},Ptr{UInt8},Int64,Cint),obj,name,ch_layout,search_flags) end function av_opt_get(obj,name,search_flags::Integer,out_val) - ccall((:av_opt_get,libavutil),Cint,(Ptr{Void},Ptr{UInt8},Cint,Ptr{Ptr{UInt8}}),obj,name,search_flags,out_val) + ccall((:av_opt_get,libavutil),Cint,(Ptr{Cvoid},Ptr{UInt8},Cint,Ptr{Ptr{UInt8}}),obj,name,search_flags,out_val) end function av_opt_get_int(obj,name,search_flags::Integer,out_val) - ccall((:av_opt_get_int,libavutil),Cint,(Ptr{Void},Ptr{UInt8},Cint,Ptr{Int64}),obj,name,search_flags,out_val) + ccall((:av_opt_get_int,libavutil),Cint,(Ptr{Cvoid},Ptr{UInt8},Cint,Ptr{Int64}),obj,name,search_flags,out_val) end function av_opt_get_double(obj,name,search_flags::Integer,out_val) - ccall((:av_opt_get_double,libavutil),Cint,(Ptr{Void},Ptr{UInt8},Cint,Ptr{Cdouble}),obj,name,search_flags,out_val) + ccall((:av_opt_get_double,libavutil),Cint,(Ptr{Cvoid},Ptr{UInt8},Cint,Ptr{Cdouble}),obj,name,search_flags,out_val) end function av_opt_get_q(obj,name,search_flags::Integer,out_val) - ccall((:av_opt_get_q,libavutil),Cint,(Ptr{Void},Ptr{UInt8},Cint,Ptr{AVRational}),obj,name,search_flags,out_val) + ccall((:av_opt_get_q,libavutil),Cint,(Ptr{Cvoid},Ptr{UInt8},Cint,Ptr{AVRational}),obj,name,search_flags,out_val) end function av_opt_get_image_size(obj,name,search_flags::Integer,w_out,h_out) - ccall((:av_opt_get_image_size,libavutil),Cint,(Ptr{Void},Ptr{UInt8},Cint,Ptr{Cint},Ptr{Cint}),obj,name,search_flags,w_out,h_out) + ccall((:av_opt_get_image_size,libavutil),Cint,(Ptr{Cvoid},Ptr{UInt8},Cint,Ptr{Cint},Ptr{Cint}),obj,name,search_flags,w_out,h_out) end function av_opt_get_pixel_fmt(obj,name,search_flags::Integer,out_fmt) - ccall((:av_opt_get_pixel_fmt,libavutil),Cint,(Ptr{Void},Ptr{UInt8},Cint,Ptr{AVPixelFormat}),obj,name,search_flags,out_fmt) + ccall((:av_opt_get_pixel_fmt,libavutil),Cint,(Ptr{Cvoid},Ptr{UInt8},Cint,Ptr{AVPixelFormat}),obj,name,search_flags,out_fmt) end function av_opt_get_sample_fmt(obj,name,search_flags::Integer,out_fmt) - ccall((:av_opt_get_sample_fmt,libavutil),Cint,(Ptr{Void},Ptr{UInt8},Cint,Ptr{AVSampleFormat}),obj,name,search_flags,out_fmt) + ccall((:av_opt_get_sample_fmt,libavutil),Cint,(Ptr{Cvoid},Ptr{UInt8},Cint,Ptr{AVSampleFormat}),obj,name,search_flags,out_fmt) end function av_opt_get_video_rate(obj,name,search_flags::Integer,out_val) - ccall((:av_opt_get_video_rate,libavutil),Cint,(Ptr{Void},Ptr{UInt8},Cint,Ptr{AVRational}),obj,name,search_flags,out_val) + ccall((:av_opt_get_video_rate,libavutil),Cint,(Ptr{Cvoid},Ptr{UInt8},Cint,Ptr{AVRational}),obj,name,search_flags,out_val) end function av_opt_get_channel_layout(obj,name,search_flags::Integer,ch_layout) - ccall((:av_opt_get_channel_layout,libavutil),Cint,(Ptr{Void},Ptr{UInt8},Cint,Ptr{Int64}),obj,name,search_flags,ch_layout) + ccall((:av_opt_get_channel_layout,libavutil),Cint,(Ptr{Cvoid},Ptr{UInt8},Cint,Ptr{Int64}),obj,name,search_flags,ch_layout) end function av_opt_ptr(avclass,obj,name) - ccall((:av_opt_ptr,libavutil),Ptr{Void},(Ptr{AVClass},Ptr{Void},Ptr{UInt8}),avclass,obj,name) + ccall((:av_opt_ptr,libavutil),Ptr{Cvoid},(Ptr{AVClass},Ptr{Cvoid},Ptr{UInt8}),avclass,obj,name) end function av_opt_freep_ranges(ranges) - ccall((:av_opt_freep_ranges,libavutil),Void,(Ptr{Ptr{AVOptionRanges}},),ranges) + ccall((:av_opt_freep_ranges,libavutil),Cvoid,(Ptr{Ptr{AVOptionRanges}},),ranges) end function av_opt_query_ranges(arg1,obj,key,flags::Integer) - ccall((:av_opt_query_ranges,libavutil),Cint,(Ptr{Ptr{AVOptionRanges}},Ptr{Void},Ptr{UInt8},Cint),arg1,obj,key,flags) + ccall((:av_opt_query_ranges,libavutil),Cint,(Ptr{Ptr{AVOptionRanges}},Ptr{Cvoid},Ptr{UInt8},Cint),arg1,obj,key,flags) end function av_opt_copy(dest,src) - ccall((:av_opt_copy,libavutil),Cint,(Ptr{Void},Ptr{Void}),dest,src) + ccall((:av_opt_copy,libavutil),Cint,(Ptr{Cvoid},Ptr{Cvoid}),dest,src) end function av_opt_query_ranges_default(arg1,obj,key,flags::Integer) - ccall((:av_opt_query_ranges_default,libavutil),Cint,(Ptr{Ptr{AVOptionRanges}},Ptr{Void},Ptr{UInt8},Cint),arg1,obj,key,flags) + ccall((:av_opt_query_ranges_default,libavutil),Cint,(Ptr{Ptr{AVOptionRanges}},Ptr{Cvoid},Ptr{UInt8},Cint),arg1,obj,key,flags) end diff --git a/src/ffmpeg/AVUtil/v52/pixdesc.jl b/src/ffmpeg/AVUtil/v52/pixdesc.jl index f8576f0e..83152d78 100644 --- a/src/ffmpeg/AVUtil/v52/pixdesc.jl +++ b/src/ffmpeg/AVUtil/v52/pixdesc.jl @@ -22,11 +22,11 @@ export function av_read_image_line(dst,data,linesize,desc,x::Integer,y::Integer,c::Integer,w::Integer,read_pal_component::Integer) - ccall((:av_read_image_line,libavutil),Void,(Ptr{UInt16},Ptr{Ptr{UInt8}},Ptr{Cint},Ptr{AVPixFmtDescriptor},Cint,Cint,Cint,Cint,Cint),dst,data,linesize,desc,x,y,c,w,read_pal_component) + ccall((:av_read_image_line,libavutil),Cvoid,(Ptr{UInt16},Ptr{Ptr{UInt8}},Ptr{Cint},Ptr{AVPixFmtDescriptor},Cint,Cint,Cint,Cint,Cint),dst,data,linesize,desc,x,y,c,w,read_pal_component) end function av_write_image_line(src,data,linesize,desc,x::Integer,y::Integer,c::Integer,w::Integer) - ccall((:av_write_image_line,libavutil),Void,(Ptr{UInt16},Ptr{Ptr{UInt8}},Ptr{Cint},Ptr{AVPixFmtDescriptor},Cint,Cint,Cint,Cint),src,data,linesize,desc,x,y,c,w) + ccall((:av_write_image_line,libavutil),Cvoid,(Ptr{UInt16},Ptr{Ptr{UInt8}},Ptr{Cint},Ptr{AVPixFmtDescriptor},Cint,Cint,Cint,Cint),src,data,linesize,desc,x,y,c,w) end function av_get_pix_fmt(name) @@ -70,7 +70,7 @@ function av_pix_fmt_count_planes(pix_fmt::AVPixelFormat) end function ff_check_pixfmt_descriptors() - ccall((:ff_check_pixfmt_descriptors,libavutil),Void,()) + ccall((:ff_check_pixfmt_descriptors,libavutil),Cvoid,()) end function av_pix_fmt_swap_endianness(pix_fmt::AVPixelFormat) diff --git a/src/ffmpeg/AVUtil/v52/threadmessage.jl b/src/ffmpeg/AVUtil/v52/threadmessage.jl index 5e7f3c30..f1458799 100644 --- a/src/ffmpeg/AVUtil/v52/threadmessage.jl +++ b/src/ffmpeg/AVUtil/v52/threadmessage.jl @@ -16,21 +16,21 @@ function av_thread_message_queue_alloc(mq,nelem::Integer,elsize::Integer) end function av_thread_message_queue_free(mq) - ccall((:av_thread_message_queue_free,libavutil),Void,(Ptr{Ptr{AVThreadMessageQueue}},),mq) + ccall((:av_thread_message_queue_free,libavutil),Cvoid,(Ptr{Ptr{AVThreadMessageQueue}},),mq) end function av_thread_message_queue_send(mq,msg,flags::Integer) - ccall((:av_thread_message_queue_send,libavutil),Cint,(Ptr{AVThreadMessageQueue},Ptr{Void},UInt32),mq,msg,flags) + ccall((:av_thread_message_queue_send,libavutil),Cint,(Ptr{AVThreadMessageQueue},Ptr{Cvoid},UInt32),mq,msg,flags) end function av_thread_message_queue_recv(mq,msg,flags::Integer) - ccall((:av_thread_message_queue_recv,libavutil),Cint,(Ptr{AVThreadMessageQueue},Ptr{Void},UInt32),mq,msg,flags) + ccall((:av_thread_message_queue_recv,libavutil),Cint,(Ptr{AVThreadMessageQueue},Ptr{Cvoid},UInt32),mq,msg,flags) end function av_thread_message_queue_set_err_send(mq,err::Integer) - ccall((:av_thread_message_queue_set_err_send,libavutil),Void,(Ptr{AVThreadMessageQueue},Cint),mq,err) + ccall((:av_thread_message_queue_set_err_send,libavutil),Cvoid,(Ptr{AVThreadMessageQueue},Cint),mq,err) end function av_thread_message_queue_set_err_recv(mq,err::Integer) - ccall((:av_thread_message_queue_set_err_recv,libavutil),Void,(Ptr{AVThreadMessageQueue},Cint),mq,err) + ccall((:av_thread_message_queue_set_err_recv,libavutil),Cvoid,(Ptr{AVThreadMessageQueue},Cint),mq,err) end diff --git a/src/ffmpeg/AVUtil/v52/timecode.jl b/src/ffmpeg/AVUtil/v52/timecode.jl index 79f027ad..f02c2dcb 100644 --- a/src/ffmpeg/AVUtil/v52/timecode.jl +++ b/src/ffmpeg/AVUtil/v52/timecode.jl @@ -34,11 +34,11 @@ function av_timecode_make_mpeg_tc_string(buf,tc25bit::Integer) end function av_timecode_init(tc,rate::AVRational,flags::Integer,frame_start::Integer,log_ctx) - ccall((:av_timecode_init,libavutil),Cint,(Ptr{AVTimecode},AVRational,Cint,Cint,Ptr{Void}),tc,rate,flags,frame_start,log_ctx) + ccall((:av_timecode_init,libavutil),Cint,(Ptr{AVTimecode},AVRational,Cint,Cint,Ptr{Cvoid}),tc,rate,flags,frame_start,log_ctx) end function av_timecode_init_from_string(tc,rate::AVRational,str,log_ctx) - ccall((:av_timecode_init_from_string,libavutil),Cint,(Ptr{AVTimecode},AVRational,Ptr{UInt8},Ptr{Void}),tc,rate,str,log_ctx) + ccall((:av_timecode_init_from_string,libavutil),Cint,(Ptr{AVTimecode},AVRational,Ptr{UInt8},Ptr{Cvoid}),tc,rate,str,log_ctx) end function av_timecode_check_frame_rate(rate::AVRational) diff --git a/src/ffmpeg/AVUtil/v52/xtea.jl b/src/ffmpeg/AVUtil/v52/xtea.jl index fda8811f..85614458 100644 --- a/src/ffmpeg/AVUtil/v52/xtea.jl +++ b/src/ffmpeg/AVUtil/v52/xtea.jl @@ -8,9 +8,9 @@ export function av_xtea_init(ctx,key) - ccall((:av_xtea_init,libavutil),Void,(Ptr{AVXTEA},Ptr{UInt8}),ctx,key) + ccall((:av_xtea_init,libavutil),Cvoid,(Ptr{AVXTEA},Ptr{UInt8}),ctx,key) end function av_xtea_crypt(ctx,dst,src,count::Integer,iv,decrypt::Integer) - ccall((:av_xtea_crypt,libavutil),Void,(Ptr{AVXTEA},Ptr{UInt8},Ptr{UInt8},Cint,Ptr{UInt8},Cint),ctx,dst,src,count,iv,decrypt) + ccall((:av_xtea_crypt,libavutil),Cvoid,(Ptr{AVXTEA},Ptr{UInt8},Ptr{UInt8},Cint,Ptr{UInt8},Cint),ctx,dst,src,count,iv,decrypt) end diff --git a/src/ffmpeg/AVUtil/v54/audio_fifo.jl b/src/ffmpeg/AVUtil/v54/audio_fifo.jl index 002f4ec9..99485711 100644 --- a/src/ffmpeg/AVUtil/v54/audio_fifo.jl +++ b/src/ffmpeg/AVUtil/v54/audio_fifo.jl @@ -15,7 +15,7 @@ export function av_audio_fifo_free(af) - ccall((:av_audio_fifo_free,libavutil),Void,(Ptr{AVAudioFifo},),af) + ccall((:av_audio_fifo_free,libavutil),Cvoid,(Ptr{AVAudioFifo},),af) end function av_audio_fifo_alloc(sample_fmt::AVSampleFormat,channels::Integer,nb_samples::Integer) @@ -27,11 +27,11 @@ function av_audio_fifo_realloc(af,nb_samples::Integer) end function av_audio_fifo_write(af,data,nb_samples::Integer) - ccall((:av_audio_fifo_write,libavutil),Cint,(Ptr{AVAudioFifo},Ptr{Ptr{Void}},Cint),af,data,nb_samples) + ccall((:av_audio_fifo_write,libavutil),Cint,(Ptr{AVAudioFifo},Ptr{Ptr{Cvoid}},Cint),af,data,nb_samples) end function av_audio_fifo_read(af,data,nb_samples::Integer) - ccall((:av_audio_fifo_read,libavutil),Cint,(Ptr{AVAudioFifo},Ptr{Ptr{Void}},Cint),af,data,nb_samples) + ccall((:av_audio_fifo_read,libavutil),Cint,(Ptr{AVAudioFifo},Ptr{Ptr{Cvoid}},Cint),af,data,nb_samples) end function av_audio_fifo_drain(af,nb_samples::Integer) @@ -39,7 +39,7 @@ function av_audio_fifo_drain(af,nb_samples::Integer) end function av_audio_fifo_reset(af) - ccall((:av_audio_fifo_reset,libavutil),Void,(Ptr{AVAudioFifo},),af) + ccall((:av_audio_fifo_reset,libavutil),Cvoid,(Ptr{AVAudioFifo},),af) end function av_audio_fifo_size(af) diff --git a/src/ffmpeg/AVUtil/v54/avutil.jl b/src/ffmpeg/AVUtil/v54/avutil.jl index ea3e1902..70f96ad8 100644 --- a/src/ffmpeg/AVUtil/v54/avutil.jl +++ b/src/ffmpeg/AVUtil/v54/avutil.jl @@ -35,15 +35,15 @@ function av_get_picture_type_char(pict_type::AVPictureType) end function av_x_if_null(p,x) - ccall((:av_x_if_null,libavutil),Ptr{Void},(Ptr{Void},Ptr{Void}),p,x) + ccall((:av_x_if_null,libavutil),Ptr{Cvoid},(Ptr{Cvoid},Ptr{Cvoid}),p,x) end function av_int_list_length_for_size(elsize::Integer,list,term::UInt64) - ccall((:av_int_list_length_for_size,libavutil),UInt32,(UInt32,Ptr{Void},UInt64),elsize,list,term) + ccall((:av_int_list_length_for_size,libavutil),UInt32,(UInt32,Ptr{Cvoid},UInt64),elsize,list,term) end function av_fopen_utf8(path,mode) - ccall((:av_fopen_utf8,libavutil),Ptr{Void},(Ptr{UInt8},Ptr{UInt8}),path,mode) + ccall((:av_fopen_utf8,libavutil),Ptr{Cvoid},(Ptr{UInt8},Ptr{UInt8}),path,mode) end function av_get_time_base_q() diff --git a/src/ffmpeg/AVUtil/v54/buffer.jl b/src/ffmpeg/AVUtil/v54/buffer.jl index 2ef995dd..7c2d098c 100644 --- a/src/ffmpeg/AVUtil/v54/buffer.jl +++ b/src/ffmpeg/AVUtil/v54/buffer.jl @@ -28,11 +28,11 @@ function av_buffer_allocz(size::Integer) end function av_buffer_create(data,size::Integer,free,opaque,flags::Integer) - ccall((:av_buffer_create,libavutil),Ptr{AVBufferRef},(Ptr{UInt8},Cint,Ptr{Void},Ptr{Void},Cint),data,size,free,opaque,flags) + ccall((:av_buffer_create,libavutil),Ptr{AVBufferRef},(Ptr{UInt8},Cint,Ptr{Cvoid},Ptr{Cvoid},Cint),data,size,free,opaque,flags) end function av_buffer_default_free(opaque,data) - ccall((:av_buffer_default_free,libavutil),Void,(Ptr{Void},Ptr{UInt8}),opaque,data) + ccall((:av_buffer_default_free,libavutil),Cvoid,(Ptr{Cvoid},Ptr{UInt8}),opaque,data) end function av_buffer_ref(buf) @@ -40,7 +40,7 @@ function av_buffer_ref(buf) end function av_buffer_unref(buf) - ccall((:av_buffer_unref,libavutil),Void,(Ptr{Ptr{AVBufferRef}},),buf) + ccall((:av_buffer_unref,libavutil),Cvoid,(Ptr{Ptr{AVBufferRef}},),buf) end function av_buffer_is_writable(buf) @@ -48,7 +48,7 @@ function av_buffer_is_writable(buf) end function av_buffer_get_opaque(buf) - ccall((:av_buffer_get_opaque,libavutil),Ptr{Void},(Ptr{AVBufferRef},),buf) + ccall((:av_buffer_get_opaque,libavutil),Ptr{Cvoid},(Ptr{AVBufferRef},),buf) end function av_buffer_get_ref_count(buf) @@ -64,11 +64,11 @@ function av_buffer_realloc(buf,size::Integer) end function av_buffer_pool_init(size::Integer,alloc) - ccall((:av_buffer_pool_init,libavutil),Ptr{AVBufferPool},(Cint,Ptr{Void}),size,alloc) + ccall((:av_buffer_pool_init,libavutil),Ptr{AVBufferPool},(Cint,Ptr{Cvoid}),size,alloc) end function av_buffer_pool_uninit(pool) - ccall((:av_buffer_pool_uninit,libavutil),Void,(Ptr{Ptr{AVBufferPool}},),pool) + ccall((:av_buffer_pool_uninit,libavutil),Cvoid,(Ptr{Ptr{AVBufferPool}},),pool) end function av_buffer_pool_get(pool) diff --git a/src/ffmpeg/AVUtil/v54/channel_layout.jl b/src/ffmpeg/AVUtil/v54/channel_layout.jl index 58d466d7..9258395a 100644 --- a/src/ffmpeg/AVUtil/v54/channel_layout.jl +++ b/src/ffmpeg/AVUtil/v54/channel_layout.jl @@ -20,11 +20,11 @@ function av_get_channel_layout(name) end function av_get_channel_layout_string(buf,buf_size::Integer,nb_channels::Integer,channel_layout::UInt64) - ccall((:av_get_channel_layout_string,libavutil),Void,(Ptr{UInt8},Cint,Cint,UInt64),buf,buf_size,nb_channels,channel_layout) + ccall((:av_get_channel_layout_string,libavutil),Cvoid,(Ptr{UInt8},Cint,Cint,UInt64),buf,buf_size,nb_channels,channel_layout) end function av_bprint_channel_layout(bp,nb_channels::Integer,channel_layout::UInt64) - ccall((:av_bprint_channel_layout,libavutil),Void,(Ptr{AVBPrint},Cint,UInt64),bp,nb_channels,channel_layout) + ccall((:av_bprint_channel_layout,libavutil),Cvoid,(Ptr{AVBPrint},Cint,UInt64),bp,nb_channels,channel_layout) end function av_get_channel_layout_nb_channels(channel_layout::UInt64) diff --git a/src/ffmpeg/AVUtil/v54/dict.jl b/src/ffmpeg/AVUtil/v54/dict.jl index 0a63cfb1..1a3aebe7 100644 --- a/src/ffmpeg/AVUtil/v54/dict.jl +++ b/src/ffmpeg/AVUtil/v54/dict.jl @@ -33,9 +33,9 @@ function av_dict_parse_string(pm,str,key_val_sep,pairs_sep,flags::Integer) end function av_dict_copy(dst,src,flags::Integer) - ccall((:av_dict_copy,libavutil),Void,(Ptr{Ptr{AVDictionary}},Ptr{AVDictionary},Cint),dst,src,flags) + ccall((:av_dict_copy,libavutil),Cvoid,(Ptr{Ptr{AVDictionary}},Ptr{AVDictionary},Cint),dst,src,flags) end function av_dict_free(m) - ccall((:av_dict_free,libavutil),Void,(Ptr{Ptr{AVDictionary}},),m) + ccall((:av_dict_free,libavutil),Cvoid,(Ptr{Ptr{AVDictionary}},),m) end diff --git a/src/ffmpeg/AVUtil/v54/display.jl b/src/ffmpeg/AVUtil/v54/display.jl index 060548ca..e55f25ce 100644 --- a/src/ffmpeg/AVUtil/v54/display.jl +++ b/src/ffmpeg/AVUtil/v54/display.jl @@ -13,9 +13,9 @@ function av_display_rotation_get(matrix) end function av_display_rotation_set(matrix,angle::Cdouble) - ccall((:av_display_rotation_set,libavutil),Void,(Ptr{Int32},Cdouble),matrix,angle) + ccall((:av_display_rotation_set,libavutil),Cvoid,(Ptr{Int32},Cdouble),matrix,angle) end function av_display_matrix_flip(matrix,hflip::Integer,vflip::Integer) - ccall((:av_display_matrix_flip,libavutil),Void,(Ptr{Int32},Cint,Cint),matrix,hflip,vflip) + ccall((:av_display_matrix_flip,libavutil),Cvoid,(Ptr{Int32},Cint,Cint),matrix,hflip,vflip) end diff --git a/src/ffmpeg/AVUtil/v54/fifo.jl b/src/ffmpeg/AVUtil/v54/fifo.jl index 19f4ad01..4411011e 100644 --- a/src/ffmpeg/AVUtil/v54/fifo.jl +++ b/src/ffmpeg/AVUtil/v54/fifo.jl @@ -27,15 +27,15 @@ function av_fifo_alloc_array(nmemb::Csize_t,size::Csize_t) end function av_fifo_free(f) - ccall((:av_fifo_free,libavutil),Void,(Ptr{AVFifoBuffer},),f) + ccall((:av_fifo_free,libavutil),Cvoid,(Ptr{AVFifoBuffer},),f) end function av_fifo_freep(f) - ccall((:av_fifo_freep,libavutil),Void,(Ptr{Ptr{AVFifoBuffer}},),f) + ccall((:av_fifo_freep,libavutil),Cvoid,(Ptr{Ptr{AVFifoBuffer}},),f) end function av_fifo_reset(f) - ccall((:av_fifo_reset,libavutil),Void,(Ptr{AVFifoBuffer},),f) + ccall((:av_fifo_reset,libavutil),Cvoid,(Ptr{AVFifoBuffer},),f) end function av_fifo_size(f) @@ -47,11 +47,11 @@ function av_fifo_space(f) end function av_fifo_generic_read(f,dest,buf_size::Integer,func) - ccall((:av_fifo_generic_read,libavutil),Cint,(Ptr{AVFifoBuffer},Ptr{Void},Cint,Ptr{Void}),f,dest,buf_size,func) + ccall((:av_fifo_generic_read,libavutil),Cint,(Ptr{AVFifoBuffer},Ptr{Cvoid},Cint,Ptr{Cvoid}),f,dest,buf_size,func) end function av_fifo_generic_write(f,src,size::Integer,func) - ccall((:av_fifo_generic_write,libavutil),Cint,(Ptr{AVFifoBuffer},Ptr{Void},Cint,Ptr{Void}),f,src,size,func) + ccall((:av_fifo_generic_write,libavutil),Cint,(Ptr{AVFifoBuffer},Ptr{Cvoid},Cint,Ptr{Cvoid}),f,src,size,func) end function av_fifo_realloc2(f,size::Integer) @@ -63,7 +63,7 @@ function av_fifo_grow(f,additional_space::Integer) end function av_fifo_drain(f,size::Integer) - ccall((:av_fifo_drain,libavutil),Void,(Ptr{AVFifoBuffer},Cint),f,size) + ccall((:av_fifo_drain,libavutil),Cvoid,(Ptr{AVFifoBuffer},Cint),f,size) end function av_fifo_peek2(f,offs::Integer) diff --git a/src/ffmpeg/AVUtil/v54/file.jl b/src/ffmpeg/AVUtil/v54/file.jl index 19041abc..e71e071b 100644 --- a/src/ffmpeg/AVUtil/v54/file.jl +++ b/src/ffmpeg/AVUtil/v54/file.jl @@ -9,13 +9,13 @@ export function av_file_map(filename,bufptr,size,log_offset::Integer,log_ctx) - ccall((:av_file_map,libavutil),Cint,(Ptr{UInt8},Ptr{Ptr{UInt8}},Ptr{Csize_t},Cint,Ptr{Void}),filename,bufptr,size,log_offset,log_ctx) + ccall((:av_file_map,libavutil),Cint,(Ptr{UInt8},Ptr{Ptr{UInt8}},Ptr{Csize_t},Cint,Ptr{Cvoid}),filename,bufptr,size,log_offset,log_ctx) end function av_file_unmap(bufptr,size::Csize_t) - ccall((:av_file_unmap,libavutil),Void,(Ptr{UInt8},Csize_t),bufptr,size) + ccall((:av_file_unmap,libavutil),Cvoid,(Ptr{UInt8},Csize_t),bufptr,size) end function av_tempfile(prefix,filename,log_offset::Integer,log_ctx) - ccall((:av_tempfile,libavutil),Cint,(Ptr{UInt8},Ptr{Ptr{UInt8}},Cint,Ptr{Void}),prefix,filename,log_offset,log_ctx) + ccall((:av_tempfile,libavutil),Cint,(Ptr{UInt8},Ptr{Ptr{UInt8}},Cint,Ptr{Cvoid}),prefix,filename,log_offset,log_ctx) end diff --git a/src/ffmpeg/AVUtil/v54/frame.jl b/src/ffmpeg/AVUtil/v54/frame.jl index 08a16520..8f8262bd 100644 --- a/src/ffmpeg/AVUtil/v54/frame.jl +++ b/src/ffmpeg/AVUtil/v54/frame.jl @@ -52,7 +52,7 @@ function av_frame_get_best_effort_timestamp(frame) end function av_frame_set_best_effort_timestamp(frame,val::Int64) - ccall((:av_frame_set_best_effort_timestamp,libavutil),Void,(Ptr{AVFrame},Int64),frame,val) + ccall((:av_frame_set_best_effort_timestamp,libavutil),Cvoid,(Ptr{AVFrame},Int64),frame,val) end function av_frame_get_pkt_duration(frame) @@ -60,7 +60,7 @@ function av_frame_get_pkt_duration(frame) end function av_frame_set_pkt_duration(frame,val::Int64) - ccall((:av_frame_set_pkt_duration,libavutil),Void,(Ptr{AVFrame},Int64),frame,val) + ccall((:av_frame_set_pkt_duration,libavutil),Cvoid,(Ptr{AVFrame},Int64),frame,val) end function av_frame_get_pkt_pos(frame) @@ -68,7 +68,7 @@ function av_frame_get_pkt_pos(frame) end function av_frame_set_pkt_pos(frame,val::Int64) - ccall((:av_frame_set_pkt_pos,libavutil),Void,(Ptr{AVFrame},Int64),frame,val) + ccall((:av_frame_set_pkt_pos,libavutil),Cvoid,(Ptr{AVFrame},Int64),frame,val) end function av_frame_get_channel_layout(frame) @@ -76,7 +76,7 @@ function av_frame_get_channel_layout(frame) end function av_frame_set_channel_layout(frame,val::Int64) - ccall((:av_frame_set_channel_layout,libavutil),Void,(Ptr{AVFrame},Int64),frame,val) + ccall((:av_frame_set_channel_layout,libavutil),Cvoid,(Ptr{AVFrame},Int64),frame,val) end function av_frame_get_channels(frame) @@ -84,7 +84,7 @@ function av_frame_get_channels(frame) end function av_frame_set_channels(frame,val::Integer) - ccall((:av_frame_set_channels,libavutil),Void,(Ptr{AVFrame},Cint),frame,val) + ccall((:av_frame_set_channels,libavutil),Cvoid,(Ptr{AVFrame},Cint),frame,val) end function av_frame_get_sample_rate(frame) @@ -92,7 +92,7 @@ function av_frame_get_sample_rate(frame) end function av_frame_set_sample_rate(frame,val::Integer) - ccall((:av_frame_set_sample_rate,libavutil),Void,(Ptr{AVFrame},Cint),frame,val) + ccall((:av_frame_set_sample_rate,libavutil),Cvoid,(Ptr{AVFrame},Cint),frame,val) end function av_frame_get_metadata(frame) @@ -100,7 +100,7 @@ function av_frame_get_metadata(frame) end function av_frame_set_metadata(frame,val) - ccall((:av_frame_set_metadata,libavutil),Void,(Ptr{AVFrame},Ptr{AVDictionary}),frame,val) + ccall((:av_frame_set_metadata,libavutil),Cvoid,(Ptr{AVFrame},Ptr{AVDictionary}),frame,val) end function av_frame_get_decode_error_flags(frame) @@ -108,7 +108,7 @@ function av_frame_get_decode_error_flags(frame) end function av_frame_set_decode_error_flags(frame,val::Integer) - ccall((:av_frame_set_decode_error_flags,libavutil),Void,(Ptr{AVFrame},Cint),frame,val) + ccall((:av_frame_set_decode_error_flags,libavutil),Cvoid,(Ptr{AVFrame},Cint),frame,val) end function av_frame_get_pkt_size(frame) @@ -116,7 +116,7 @@ function av_frame_get_pkt_size(frame) end function av_frame_set_pkt_size(frame,val::Integer) - ccall((:av_frame_set_pkt_size,libavutil),Void,(Ptr{AVFrame},Cint),frame,val) + ccall((:av_frame_set_pkt_size,libavutil),Cvoid,(Ptr{AVFrame},Cint),frame,val) end function avpriv_frame_get_metadatap(frame) @@ -136,7 +136,7 @@ function av_frame_get_colorspace(frame) end function av_frame_set_colorspace(frame,val::AVColorSpace) - ccall((:av_frame_set_colorspace,libavutil),Void,(Ptr{AVFrame},AVColorSpace),frame,val) + ccall((:av_frame_set_colorspace,libavutil),Cvoid,(Ptr{AVFrame},AVColorSpace),frame,val) end function av_frame_get_color_range(frame) @@ -144,7 +144,7 @@ function av_frame_get_color_range(frame) end function av_frame_set_color_range(frame,val::AVColorRange) - ccall((:av_frame_set_color_range,libavutil),Void,(Ptr{AVFrame},AVColorRange),frame,val) + ccall((:av_frame_set_color_range,libavutil),Cvoid,(Ptr{AVFrame},AVColorRange),frame,val) end function av_get_colorspace_name(val::AVColorSpace) @@ -156,7 +156,7 @@ function av_frame_alloc() end function av_frame_free(frame) - ccall((:av_frame_free,libavutil),Void,(Ptr{Ptr{AVFrame}},),frame) + ccall((:av_frame_free,libavutil),Cvoid,(Ptr{Ptr{AVFrame}},),frame) end function av_frame_ref(dst,src) @@ -168,11 +168,11 @@ function av_frame_clone(src) end function av_frame_unref(frame) - ccall((:av_frame_unref,libavutil),Void,(Ptr{AVFrame},),frame) + ccall((:av_frame_unref,libavutil),Cvoid,(Ptr{AVFrame},),frame) end function av_frame_move_ref(dst,src) - ccall((:av_frame_move_ref,libavutil),Void,(Ptr{AVFrame},Ptr{AVFrame}),dst,src) + ccall((:av_frame_move_ref,libavutil),Cvoid,(Ptr{AVFrame},Ptr{AVFrame}),dst,src) end function av_frame_get_buffer(frame,align::Integer) @@ -208,7 +208,7 @@ function av_frame_get_side_data(frame,_type::AVFrameSideDataType) end function av_frame_remove_side_data(frame,_type::AVFrameSideDataType) - ccall((:av_frame_remove_side_data,libavutil),Void,(Ptr{AVFrame},AVFrameSideDataType),frame,_type) + ccall((:av_frame_remove_side_data,libavutil),Cvoid,(Ptr{AVFrame},AVFrameSideDataType),frame,_type) end function av_frame_side_data_name(_type::AVFrameSideDataType) diff --git a/src/ffmpeg/AVUtil/v54/hash.jl b/src/ffmpeg/AVUtil/v54/hash.jl index 6fc517e9..e7a99371 100644 --- a/src/ffmpeg/AVUtil/v54/hash.jl +++ b/src/ffmpeg/AVUtil/v54/hash.jl @@ -33,29 +33,29 @@ function av_hash_get_size(ctx) end function av_hash_init(ctx) - ccall((:av_hash_init,libavutil),Void,(Ptr{AVHashContext},),ctx) + ccall((:av_hash_init,libavutil),Cvoid,(Ptr{AVHashContext},),ctx) end function av_hash_update(ctx,src,len::Integer) - ccall((:av_hash_update,libavutil),Void,(Ptr{AVHashContext},Ptr{UInt8},Cint),ctx,src,len) + ccall((:av_hash_update,libavutil),Cvoid,(Ptr{AVHashContext},Ptr{UInt8},Cint),ctx,src,len) end function av_hash_final(ctx,dst) - ccall((:av_hash_final,libavutil),Void,(Ptr{AVHashContext},Ptr{UInt8}),ctx,dst) + ccall((:av_hash_final,libavutil),Cvoid,(Ptr{AVHashContext},Ptr{UInt8}),ctx,dst) end function av_hash_final_bin(ctx,dst,size::Integer) - ccall((:av_hash_final_bin,libavutil),Void,(Ptr{AVHashContext},Ptr{UInt8},Cint),ctx,dst,size) + ccall((:av_hash_final_bin,libavutil),Cvoid,(Ptr{AVHashContext},Ptr{UInt8},Cint),ctx,dst,size) end function av_hash_final_hex(ctx,dst,size::Integer) - ccall((:av_hash_final_hex,libavutil),Void,(Ptr{AVHashContext},Ptr{UInt8},Cint),ctx,dst,size) + ccall((:av_hash_final_hex,libavutil),Cvoid,(Ptr{AVHashContext},Ptr{UInt8},Cint),ctx,dst,size) end function av_hash_final_b64(ctx,dst,size::Integer) - ccall((:av_hash_final_b64,libavutil),Void,(Ptr{AVHashContext},Ptr{UInt8},Cint),ctx,dst,size) + ccall((:av_hash_final_b64,libavutil),Cvoid,(Ptr{AVHashContext},Ptr{UInt8},Cint),ctx,dst,size) end function av_hash_freep(ctx) - ccall((:av_hash_freep,libavutil),Void,(Ptr{Ptr{AVHashContext}},),ctx) + ccall((:av_hash_freep,libavutil),Cvoid,(Ptr{Ptr{AVHashContext}},),ctx) end diff --git a/src/ffmpeg/AVUtil/v54/imgutils.jl b/src/ffmpeg/AVUtil/v54/imgutils.jl index 4b9d9379..9a8dda76 100644 --- a/src/ffmpeg/AVUtil/v54/imgutils.jl +++ b/src/ffmpeg/AVUtil/v54/imgutils.jl @@ -18,7 +18,7 @@ export function av_image_fill_max_pixsteps(max_pixsteps,max_pixstep_comps,pixdesc) - ccall((:av_image_fill_max_pixsteps,libavutil),Void,(Ptr{Cint},Ptr{Cint},Ptr{AVPixFmtDescriptor}),max_pixsteps,max_pixstep_comps,pixdesc) + ccall((:av_image_fill_max_pixsteps,libavutil),Cvoid,(Ptr{Cint},Ptr{Cint},Ptr{AVPixFmtDescriptor}),max_pixsteps,max_pixstep_comps,pixdesc) end function av_image_get_linesize(pix_fmt::AVPixelFormat,width::Integer,plane::Integer) @@ -38,11 +38,11 @@ function av_image_alloc(pointers,linesizes,w::Integer,h::Integer,pix_fmt::AVPixe end function av_image_copy_plane(dst,dst_linesize::Integer,src,src_linesize::Integer,bytewidth::Integer,height::Integer) - ccall((:av_image_copy_plane,libavutil),Void,(Ptr{UInt8},Cint,Ptr{UInt8},Cint,Cint,Cint),dst,dst_linesize,src,src_linesize,bytewidth,height) + ccall((:av_image_copy_plane,libavutil),Cvoid,(Ptr{UInt8},Cint,Ptr{UInt8},Cint,Cint,Cint),dst,dst_linesize,src,src_linesize,bytewidth,height) end function av_image_copy(dst_data,dst_linesizes,src_data,src_linesizes,pix_fmt::AVPixelFormat,width::Integer,height::Integer) - ccall((:av_image_copy,libavutil),Void,(Ptr{Ptr{UInt8}},Ptr{Cint},Ptr{Ptr{UInt8}},Ptr{Cint},AVPixelFormat,Cint,Cint),dst_data,dst_linesizes,src_data,src_linesizes,pix_fmt,width,height) + ccall((:av_image_copy,libavutil),Cvoid,(Ptr{Ptr{UInt8}},Ptr{Cint},Ptr{Ptr{UInt8}},Ptr{Cint},AVPixelFormat,Cint,Cint),dst_data,dst_linesizes,src_data,src_linesizes,pix_fmt,width,height) end function av_image_fill_arrays(dst_data,dst_linesize,src,pix_fmt::AVPixelFormat,width::Integer,height::Integer,align::Integer) @@ -58,7 +58,7 @@ function av_image_copy_to_buffer(dst,dst_size::Integer,src_data,src_linesize,pix end function av_image_check_size(w::Integer,h::Integer,log_offset::Integer,log_ctx) - ccall((:av_image_check_size,libavutil),Cint,(UInt32,UInt32,Cint,Ptr{Void}),w,h,log_offset,log_ctx) + ccall((:av_image_check_size,libavutil),Cint,(UInt32,UInt32,Cint,Ptr{Cvoid}),w,h,log_offset,log_ctx) end function av_image_check_sar(w::Integer,h::Integer,sar::AVRational) diff --git a/src/ffmpeg/AVUtil/v54/libavutil_h.jl b/src/ffmpeg/AVUtil/v54/libavutil_h.jl index dce107ce..f679ee1a 100644 --- a/src/ffmpeg/AVUtil/v54/libavutil_h.jl +++ b/src/ffmpeg/AVUtil/v54/libavutil_h.jl @@ -718,7 +718,7 @@ const AV_PICTURE_TYPE_BI = UInt32(7) const AV_BUFFER_FLAG_READONLY = 1 << 0 -const AVBuffer = Void +const AVBuffer = Nothing struct AVBufferRef buffer::Ptr{AVBuffer} @@ -726,7 +726,7 @@ struct AVBufferRef size::Cint end -const AVBufferPool = Void +const AVBufferPool = Nothing const AV_CH_FRONT_LEFT = 0x00000001 const AV_CH_FRONT_RIGHT = 0x00000002 @@ -794,7 +794,7 @@ const AV_MATRIX_ENCODING_DOLBYHEADPHONE = UInt32(6) const AV_MATRIX_ENCODING_NB = UInt32(7) # end enum AVMatrixEncoding -const AVBPrint = Void +const AVBPrint = Nothing const AV_DICT_MATCH_CASE = 1 const AV_DICT_IGNORE_SUFFIX = 2 @@ -808,7 +808,7 @@ struct AVDictionaryEntry value::Ptr{UInt8} end -const AVDictionary = Void +const AVDictionary = Nothing struct AVFifoBuffer buffer::Ptr{UInt8} @@ -883,8 +883,8 @@ end zero(::Type{Array_8_Cint}) = Array_8_Cint(fill(zero(Cint),8)...) struct Array_2_Ptr - d1::Ptr{Void} - d2::Ptr{Void} + d1::Ptr{Cvoid} + d2::Ptr{Cvoid} end zero(::Type{Array_2_Ptr}) = Array_2_Ptr(fill(C_NULL,2)...) @@ -1001,7 +1001,7 @@ struct AVFrame mb_type::Ptr{UInt32} dct_coeff::Ptr{Int16} ref_index::Array_2_Ptr - opaque::Ptr{Void} + opaque::Ptr{Cvoid} error::Array_8_Uint64 _type::Cint repeat_pict::Cint @@ -1009,11 +1009,11 @@ struct AVFrame top_field_first::Cint palette_has_changed::Cint buffer_hints::Cint - pan_scan::Ptr{Void} # Ptr{AVPanScan} + pan_scan::Ptr{Cvoid} # Ptr{AVPanScan} reordered_opaque::Int64 - hwaccel_picture_private::Ptr{Void} - owner::Ptr{Void} #Ptr{AVCodecContext} - thread_opaque::Ptr{Void} + hwaccel_picture_private::Ptr{Cvoid} + owner::Ptr{Cvoid} #Ptr{AVCodecContext} + thread_opaque::Ptr{Cvoid} motion_subsample_log2::UInt8 sample_rate::Cint channel_layout::UInt64 @@ -1151,7 +1151,7 @@ struct AVOption help::Ptr{UInt8} offset::Cint _type::AVOptionType - default_val::Void + default_val::Nothing min::Cdouble max::Cdouble flags::Cint @@ -1160,16 +1160,16 @@ end struct AVClass class_name::Ptr{UInt8} - item_name::Ptr{Void} + item_name::Ptr{Cvoid} option::Ptr{AVOption} version::Cint log_level_offset_offset::Cint parent_log_context_offset::Cint - child_next::Ptr{Void} - child_class_next::Ptr{Void} + child_next::Ptr{Cvoid} + child_class_next::Ptr{Cvoid} category::AVClassCategory - get_category::Ptr{Void} - query_ranges::Ptr{Void} + get_category::Ptr{Cvoid} + query_ranges::Ptr{Cvoid} end # Skipping MacroDefinition: DECLARE_ALIGNED ( n , t , v ) t __attribute__ ( ( aligned ( n ) ) ) v @@ -1669,7 +1669,7 @@ const LIBAVUTIL_VERSION_MICRO = 100 # Skipping MacroDefinition: FF_API_XVMC ( LIBAVUTIL_VERSION_MAJOR < 55 ) # Skipping MacroDefinition: FF_API_OPT_TYPE_METADATA ( LIBAVUTIL_VERSION_MAJOR < 55 ) -const AVAudioFifo = Void +const AVAudioFifo = Nothing # begin enum AVDownmixType const AVDownmixType = UInt32 @@ -1691,7 +1691,7 @@ end const AV_HASH_MAX_SIZE = 64 -const AVHashContext = Void +const AVHashContext = Nothing struct AVMotionVector source::Int32 @@ -1724,7 +1724,7 @@ const ANONYMOUS_2 = UInt32 const AV_OPT_FLAG_IMPLICIT_KEY = UInt32(1) # end enum ANONYMOUS_2 -const av_pixelutils_sad_fn = Ptr{Void} +const av_pixelutils_sad_fn = Ptr{Cvoid} struct AVReplayGain track_gain::Int32 @@ -1752,7 +1752,7 @@ struct AVStereo3D flags::Cint end -const AVThreadMessageQueue = Void +const AVThreadMessageQueue = Nothing # begin enum AVThreadMessageFlags const AVThreadMessageFlags = UInt32 diff --git a/src/ffmpeg/AVUtil/v54/log.jl b/src/ffmpeg/AVUtil/v54/log.jl index 7eb7d6f1..ffa81bf1 100644 --- a/src/ffmpeg/AVUtil/v54/log.jl +++ b/src/ffmpeg/AVUtil/v54/log.jl @@ -24,11 +24,11 @@ function av_log_get_level() end function av_log_set_level(level::Integer) - ccall((:av_log_set_level,libavutil),Void,(Cint,),level) + ccall((:av_log_set_level,libavutil),Cvoid,(Cint,),level) end function av_log_set_callback(callback) - ccall((:av_log_set_callback,libavutil),Void,(Ptr{Void},),callback) + ccall((:av_log_set_callback,libavutil),Cvoid,(Ptr{Cvoid},),callback) end # function av_log_default_callback(avcl,level::Integer,fmt,vl) @@ -36,11 +36,11 @@ end # end function av_default_item_name(ctx) - ccall((:av_default_item_name,libavutil),Ptr{UInt8},(Ptr{Void},),ctx) + ccall((:av_default_item_name,libavutil),Ptr{UInt8},(Ptr{Cvoid},),ctx) end function av_default_get_category(ptr) - ccall((:av_default_get_category,libavutil),AVClassCategory,(Ptr{Void},),ptr) + ccall((:av_default_get_category,libavutil),AVClassCategory,(Ptr{Cvoid},),ptr) end # function av_log_format_line(ptr,level::Integer,fmt,vl,line,line_size::Integer,print_prefix) @@ -48,7 +48,7 @@ end # end function av_log_set_flags(arg::Integer) - ccall((:av_log_set_flags,libavutil),Void,(Cint,),arg) + ccall((:av_log_set_flags,libavutil),Cvoid,(Cint,),arg) end function av_log_get_flags() diff --git a/src/ffmpeg/AVUtil/v54/mem.jl b/src/ffmpeg/AVUtil/v54/mem.jl index c29b3508..a0a74347 100644 --- a/src/ffmpeg/AVUtil/v54/mem.jl +++ b/src/ffmpeg/AVUtil/v54/mem.jl @@ -29,47 +29,47 @@ export function av_malloc(size::Csize_t) - ccall((:av_malloc,libavutil),Ptr{Void},(Csize_t,),size) + ccall((:av_malloc,libavutil),Ptr{Cvoid},(Csize_t,),size) end function av_malloc_array(nmemb::Csize_t,size::Csize_t) - ccall((:av_malloc_array,libavutil),Ptr{Void},(Csize_t,Csize_t),nmemb,size) + ccall((:av_malloc_array,libavutil),Ptr{Cvoid},(Csize_t,Csize_t),nmemb,size) end function av_realloc(ptr,size::Csize_t) - ccall((:av_realloc,libavutil),Ptr{Void},(Ptr{Void},Csize_t),ptr,size) + ccall((:av_realloc,libavutil),Ptr{Cvoid},(Ptr{Cvoid},Csize_t),ptr,size) end function av_realloc_f(ptr,nelem::Csize_t,elsize::Csize_t) - ccall((:av_realloc_f,libavutil),Ptr{Void},(Ptr{Void},Csize_t,Csize_t),ptr,nelem,elsize) + ccall((:av_realloc_f,libavutil),Ptr{Cvoid},(Ptr{Cvoid},Csize_t,Csize_t),ptr,nelem,elsize) end function av_reallocp(ptr,size::Csize_t) - ccall((:av_reallocp,libavutil),Cint,(Ptr{Void},Csize_t),ptr,size) + ccall((:av_reallocp,libavutil),Cint,(Ptr{Cvoid},Csize_t),ptr,size) end function av_realloc_array(ptr,nmemb::Csize_t,size::Csize_t) - ccall((:av_realloc_array,libavutil),Ptr{Void},(Ptr{Void},Csize_t,Csize_t),ptr,nmemb,size) + ccall((:av_realloc_array,libavutil),Ptr{Cvoid},(Ptr{Cvoid},Csize_t,Csize_t),ptr,nmemb,size) end function av_reallocp_array(ptr,nmemb::Csize_t,size::Csize_t) - ccall((:av_reallocp_array,libavutil),Cint,(Ptr{Void},Csize_t,Csize_t),ptr,nmemb,size) + ccall((:av_reallocp_array,libavutil),Cint,(Ptr{Cvoid},Csize_t,Csize_t),ptr,nmemb,size) end function av_free(ptr) - ccall((:av_free,libavutil),Void,(Ptr{Void},),ptr) + ccall((:av_free,libavutil),Cvoid,(Ptr{Cvoid},),ptr) end function av_mallocz(size::Csize_t) - ccall((:av_mallocz,libavutil),Ptr{Void},(Csize_t,),size) + ccall((:av_mallocz,libavutil),Ptr{Cvoid},(Csize_t,),size) end function av_calloc(nmemb::Csize_t,size::Csize_t) - ccall((:av_calloc,libavutil),Ptr{Void},(Csize_t,Csize_t),nmemb,size) + ccall((:av_calloc,libavutil),Ptr{Cvoid},(Csize_t,Csize_t),nmemb,size) end function av_mallocz_array(nmemb::Csize_t,size::Csize_t) - ccall((:av_mallocz_array,libavutil),Ptr{Void},(Csize_t,Csize_t),nmemb,size) + ccall((:av_mallocz_array,libavutil),Ptr{Cvoid},(Csize_t,Csize_t),nmemb,size) end function av_strdup(s) @@ -81,23 +81,23 @@ function av_strndup(s,len::Csize_t) end function av_memdup(p,size::Csize_t) - ccall((:av_memdup,libavutil),Ptr{Void},(Ptr{Void},Csize_t),p,size) + ccall((:av_memdup,libavutil),Ptr{Cvoid},(Ptr{Cvoid},Csize_t),p,size) end function av_freep(ptr) - ccall((:av_freep,libavutil),Void,(Ptr{Void},),ptr) + ccall((:av_freep,libavutil),Cvoid,(Ptr{Cvoid},),ptr) end function av_dynarray_add(tab_ptr,nb_ptr,elem) - ccall((:av_dynarray_add,libavutil),Void,(Ptr{Void},Ptr{Cint},Ptr{Void}),tab_ptr,nb_ptr,elem) + ccall((:av_dynarray_add,libavutil),Cvoid,(Ptr{Cvoid},Ptr{Cint},Ptr{Cvoid}),tab_ptr,nb_ptr,elem) end function av_dynarray_add_nofree(tab_ptr,nb_ptr,elem) - ccall((:av_dynarray_add_nofree,libavutil),Cint,(Ptr{Void},Ptr{Cint},Ptr{Void}),tab_ptr,nb_ptr,elem) + ccall((:av_dynarray_add_nofree,libavutil),Cint,(Ptr{Cvoid},Ptr{Cint},Ptr{Cvoid}),tab_ptr,nb_ptr,elem) end function av_dynarray2_add(tab_ptr,nb_ptr,elem_size::Csize_t,elem_data) - ccall((:av_dynarray2_add,libavutil),Ptr{Void},(Ptr{Ptr{Void}},Ptr{Cint},Csize_t,Ptr{UInt8}),tab_ptr,nb_ptr,elem_size,elem_data) + ccall((:av_dynarray2_add,libavutil),Ptr{Cvoid},(Ptr{Ptr{Cvoid}},Ptr{Cint},Csize_t,Ptr{UInt8}),tab_ptr,nb_ptr,elem_size,elem_data) end function av_size_mult(a::Csize_t,b::Csize_t,r) @@ -105,17 +105,17 @@ function av_size_mult(a::Csize_t,b::Csize_t,r) end function av_max_alloc(max::Csize_t) - ccall((:av_max_alloc,libavutil),Void,(Csize_t,),max) + ccall((:av_max_alloc,libavutil),Cvoid,(Csize_t,),max) end function av_memcpy_backptr(dst,back::Integer,cnt::Integer) - ccall((:av_memcpy_backptr,libavutil),Void,(Ptr{UInt8},Cint,Cint),dst,back,cnt) + ccall((:av_memcpy_backptr,libavutil),Cvoid,(Ptr{UInt8},Cint,Cint),dst,back,cnt) end function av_fast_realloc(ptr,size,min_size::Csize_t) - ccall((:av_fast_realloc,libavutil),Ptr{Void},(Ptr{Void},Ptr{UInt32},Csize_t),ptr,size,min_size) + ccall((:av_fast_realloc,libavutil),Ptr{Cvoid},(Ptr{Cvoid},Ptr{UInt32},Csize_t),ptr,size,min_size) end function av_fast_malloc(ptr,size,min_size::Csize_t) - ccall((:av_fast_malloc,libavutil),Void,(Ptr{Void},Ptr{UInt32},Csize_t),ptr,size,min_size) + ccall((:av_fast_malloc,libavutil),Cvoid,(Ptr{Cvoid},Ptr{UInt32},Csize_t),ptr,size,min_size) end diff --git a/src/ffmpeg/AVUtil/v54/opt.jl b/src/ffmpeg/AVUtil/v54/opt.jl index 74aabd9a..6a5b3f7c 100644 --- a/src/ffmpeg/AVUtil/v54/opt.jl +++ b/src/ffmpeg/AVUtil/v54/opt.jl @@ -62,75 +62,75 @@ export function av_set_string3(obj,name,val,alloc::Integer,o_out) - ccall((:av_set_string3,libavutil),Cint,(Ptr{Void},Ptr{UInt8},Ptr{UInt8},Cint,Ptr{Ptr{AVOption}}),obj,name,val,alloc,o_out) + ccall((:av_set_string3,libavutil),Cint,(Ptr{Cvoid},Ptr{UInt8},Ptr{UInt8},Cint,Ptr{Ptr{AVOption}}),obj,name,val,alloc,o_out) end function av_set_double(obj,name,n::Cdouble) - ccall((:av_set_double,libavutil),Ptr{AVOption},(Ptr{Void},Ptr{UInt8},Cdouble),obj,name,n) + ccall((:av_set_double,libavutil),Ptr{AVOption},(Ptr{Cvoid},Ptr{UInt8},Cdouble),obj,name,n) end function av_set_q(obj,name,n::AVRational) - ccall((:av_set_q,libavutil),Ptr{AVOption},(Ptr{Void},Ptr{UInt8},AVRational),obj,name,n) + ccall((:av_set_q,libavutil),Ptr{AVOption},(Ptr{Cvoid},Ptr{UInt8},AVRational),obj,name,n) end function av_set_int(obj,name,n::Int64) - ccall((:av_set_int,libavutil),Ptr{AVOption},(Ptr{Void},Ptr{UInt8},Int64),obj,name,n) + ccall((:av_set_int,libavutil),Ptr{AVOption},(Ptr{Cvoid},Ptr{UInt8},Int64),obj,name,n) end function av_get_double(obj,name,o_out) - ccall((:av_get_double,libavutil),Cdouble,(Ptr{Void},Ptr{UInt8},Ptr{Ptr{AVOption}}),obj,name,o_out) + ccall((:av_get_double,libavutil),Cdouble,(Ptr{Cvoid},Ptr{UInt8},Ptr{Ptr{AVOption}}),obj,name,o_out) end function av_get_q(obj,name,o_out) - ccall((:av_get_q,libavutil),AVRational,(Ptr{Void},Ptr{UInt8},Ptr{Ptr{AVOption}}),obj,name,o_out) + ccall((:av_get_q,libavutil),AVRational,(Ptr{Cvoid},Ptr{UInt8},Ptr{Ptr{AVOption}}),obj,name,o_out) end function av_get_int(obj,name,o_out) - ccall((:av_get_int,libavutil),Int64,(Ptr{Void},Ptr{UInt8},Ptr{Ptr{AVOption}}),obj,name,o_out) + ccall((:av_get_int,libavutil),Int64,(Ptr{Cvoid},Ptr{UInt8},Ptr{Ptr{AVOption}}),obj,name,o_out) end function av_get_string(obj,name,o_out,buf,buf_len::Integer) - ccall((:av_get_string,libavutil),Ptr{UInt8},(Ptr{Void},Ptr{UInt8},Ptr{Ptr{AVOption}},Ptr{UInt8},Cint),obj,name,o_out,buf,buf_len) + ccall((:av_get_string,libavutil),Ptr{UInt8},(Ptr{Cvoid},Ptr{UInt8},Ptr{Ptr{AVOption}},Ptr{UInt8},Cint),obj,name,o_out,buf,buf_len) end function av_next_option(obj,last) - ccall((:av_next_option,libavutil),Ptr{AVOption},(Ptr{Void},Ptr{AVOption}),obj,last) + ccall((:av_next_option,libavutil),Ptr{AVOption},(Ptr{Cvoid},Ptr{AVOption}),obj,last) end function av_opt_show2(obj,av_log_obj,req_flags::Integer,rej_flags::Integer) - ccall((:av_opt_show2,libavutil),Cint,(Ptr{Void},Ptr{Void},Cint,Cint),obj,av_log_obj,req_flags,rej_flags) + ccall((:av_opt_show2,libavutil),Cint,(Ptr{Cvoid},Ptr{Cvoid},Cint,Cint),obj,av_log_obj,req_flags,rej_flags) end function av_opt_set_defaults(s) - ccall((:av_opt_set_defaults,libavutil),Void,(Ptr{Void},),s) + ccall((:av_opt_set_defaults,libavutil),Cvoid,(Ptr{Cvoid},),s) end function av_opt_set_defaults2(s,mask::Integer,flags::Integer) - ccall((:av_opt_set_defaults2,libavutil),Void,(Ptr{Void},Cint,Cint),s,mask,flags) + ccall((:av_opt_set_defaults2,libavutil),Cvoid,(Ptr{Cvoid},Cint,Cint),s,mask,flags) end function av_set_options_string(ctx,opts,key_val_sep,pairs_sep) - ccall((:av_set_options_string,libavutil),Cint,(Ptr{Void},Ptr{UInt8},Ptr{UInt8},Ptr{UInt8}),ctx,opts,key_val_sep,pairs_sep) + ccall((:av_set_options_string,libavutil),Cint,(Ptr{Cvoid},Ptr{UInt8},Ptr{UInt8},Ptr{UInt8}),ctx,opts,key_val_sep,pairs_sep) end function av_opt_set_from_string(ctx,opts,shorthand,key_val_sep,pairs_sep) - ccall((:av_opt_set_from_string,libavutil),Cint,(Ptr{Void},Ptr{UInt8},Ptr{Ptr{UInt8}},Ptr{UInt8},Ptr{UInt8}),ctx,opts,shorthand,key_val_sep,pairs_sep) + ccall((:av_opt_set_from_string,libavutil),Cint,(Ptr{Cvoid},Ptr{UInt8},Ptr{Ptr{UInt8}},Ptr{UInt8},Ptr{UInt8}),ctx,opts,shorthand,key_val_sep,pairs_sep) end function av_opt_free(obj) - ccall((:av_opt_free,libavutil),Void,(Ptr{Void},),obj) + ccall((:av_opt_free,libavutil),Cvoid,(Ptr{Cvoid},),obj) end function av_opt_flag_is_set(obj,field_name,flag_name) - ccall((:av_opt_flag_is_set,libavutil),Cint,(Ptr{Void},Ptr{UInt8},Ptr{UInt8}),obj,field_name,flag_name) + ccall((:av_opt_flag_is_set,libavutil),Cint,(Ptr{Cvoid},Ptr{UInt8},Ptr{UInt8}),obj,field_name,flag_name) end function av_opt_set_dict(obj,options) - ccall((:av_opt_set_dict,libavutil),Cint,(Ptr{Void},Ptr{Ptr{AVDictionary}}),obj,options) + ccall((:av_opt_set_dict,libavutil),Cint,(Ptr{Cvoid},Ptr{Ptr{AVDictionary}}),obj,options) end function av_opt_set_dict2(obj,options,search_flags::Integer) - ccall((:av_opt_set_dict2,libavutil),Cint,(Ptr{Void},Ptr{Ptr{AVDictionary}},Cint),obj,options,search_flags) + ccall((:av_opt_set_dict2,libavutil),Cint,(Ptr{Cvoid},Ptr{Ptr{AVDictionary}},Cint),obj,options,search_flags) end function av_opt_get_key_value(ropts,key_val_sep,pairs_sep,flags::Integer,rkey,rval) @@ -138,43 +138,43 @@ function av_opt_get_key_value(ropts,key_val_sep,pairs_sep,flags::Integer,rkey,rv end function av_opt_eval_flags(obj,o,val,flags_out) - ccall((:av_opt_eval_flags,libavutil),Cint,(Ptr{Void},Ptr{AVOption},Ptr{UInt8},Ptr{Cint}),obj,o,val,flags_out) + ccall((:av_opt_eval_flags,libavutil),Cint,(Ptr{Cvoid},Ptr{AVOption},Ptr{UInt8},Ptr{Cint}),obj,o,val,flags_out) end function av_opt_eval_int(obj,o,val,int_out) - ccall((:av_opt_eval_int,libavutil),Cint,(Ptr{Void},Ptr{AVOption},Ptr{UInt8},Ptr{Cint}),obj,o,val,int_out) + ccall((:av_opt_eval_int,libavutil),Cint,(Ptr{Cvoid},Ptr{AVOption},Ptr{UInt8},Ptr{Cint}),obj,o,val,int_out) end function av_opt_eval_int64(obj,o,val,int64_out) - ccall((:av_opt_eval_int64,libavutil),Cint,(Ptr{Void},Ptr{AVOption},Ptr{UInt8},Ptr{Int64}),obj,o,val,int64_out) + ccall((:av_opt_eval_int64,libavutil),Cint,(Ptr{Cvoid},Ptr{AVOption},Ptr{UInt8},Ptr{Int64}),obj,o,val,int64_out) end function av_opt_eval_float(obj,o,val,float_out) - ccall((:av_opt_eval_float,libavutil),Cint,(Ptr{Void},Ptr{AVOption},Ptr{UInt8},Ptr{Cfloat}),obj,o,val,float_out) + ccall((:av_opt_eval_float,libavutil),Cint,(Ptr{Cvoid},Ptr{AVOption},Ptr{UInt8},Ptr{Cfloat}),obj,o,val,float_out) end function av_opt_eval_double(obj,o,val,double_out) - ccall((:av_opt_eval_double,libavutil),Cint,(Ptr{Void},Ptr{AVOption},Ptr{UInt8},Ptr{Cdouble}),obj,o,val,double_out) + ccall((:av_opt_eval_double,libavutil),Cint,(Ptr{Cvoid},Ptr{AVOption},Ptr{UInt8},Ptr{Cdouble}),obj,o,val,double_out) end function av_opt_eval_q(obj,o,val,q_out) - ccall((:av_opt_eval_q,libavutil),Cint,(Ptr{Void},Ptr{AVOption},Ptr{UInt8},Ptr{AVRational}),obj,o,val,q_out) + ccall((:av_opt_eval_q,libavutil),Cint,(Ptr{Cvoid},Ptr{AVOption},Ptr{UInt8},Ptr{AVRational}),obj,o,val,q_out) end function av_opt_find(obj,name,unit,opt_flags::Integer,search_flags::Integer) - ccall((:av_opt_find,libavutil),Ptr{AVOption},(Ptr{Void},Ptr{UInt8},Ptr{UInt8},Cint,Cint),obj,name,unit,opt_flags,search_flags) + ccall((:av_opt_find,libavutil),Ptr{AVOption},(Ptr{Cvoid},Ptr{UInt8},Ptr{UInt8},Cint,Cint),obj,name,unit,opt_flags,search_flags) end function av_opt_find2(obj,name,unit,opt_flags::Integer,search_flags::Integer,target_obj) - ccall((:av_opt_find2,libavutil),Ptr{AVOption},(Ptr{Void},Ptr{UInt8},Ptr{UInt8},Cint,Cint,Ptr{Ptr{Void}}),obj,name,unit,opt_flags,search_flags,target_obj) + ccall((:av_opt_find2,libavutil),Ptr{AVOption},(Ptr{Cvoid},Ptr{UInt8},Ptr{UInt8},Cint,Cint,Ptr{Ptr{Cvoid}}),obj,name,unit,opt_flags,search_flags,target_obj) end function av_opt_next(obj,prev) - ccall((:av_opt_next,libavutil),Ptr{AVOption},(Ptr{Void},Ptr{AVOption}),obj,prev) + ccall((:av_opt_next,libavutil),Ptr{AVOption},(Ptr{Cvoid},Ptr{AVOption}),obj,prev) end function av_opt_child_next(obj,prev) - ccall((:av_opt_child_next,libavutil),Ptr{Void},(Ptr{Void},Ptr{Void}),obj,prev) + ccall((:av_opt_child_next,libavutil),Ptr{Cvoid},(Ptr{Cvoid},Ptr{Cvoid}),obj,prev) end function av_opt_child_class_next(parent,prev) @@ -182,105 +182,105 @@ function av_opt_child_class_next(parent,prev) end function av_opt_set(obj,name,val,search_flags::Integer) - ccall((:av_opt_set,libavutil),Cint,(Ptr{Void},Ptr{UInt8},Ptr{UInt8},Cint),obj,name,val,search_flags) + ccall((:av_opt_set,libavutil),Cint,(Ptr{Cvoid},Ptr{UInt8},Ptr{UInt8},Cint),obj,name,val,search_flags) end function av_opt_set_int(obj,name,val::Int64,search_flags::Integer) - ccall((:av_opt_set_int,libavutil),Cint,(Ptr{Void},Ptr{UInt8},Int64,Cint),obj,name,val,search_flags) + ccall((:av_opt_set_int,libavutil),Cint,(Ptr{Cvoid},Ptr{UInt8},Int64,Cint),obj,name,val,search_flags) end function av_opt_set_double(obj,name,val::Cdouble,search_flags::Integer) - ccall((:av_opt_set_double,libavutil),Cint,(Ptr{Void},Ptr{UInt8},Cdouble,Cint),obj,name,val,search_flags) + ccall((:av_opt_set_double,libavutil),Cint,(Ptr{Cvoid},Ptr{UInt8},Cdouble,Cint),obj,name,val,search_flags) end function av_opt_set_q(obj,name,val::AVRational,search_flags::Integer) - ccall((:av_opt_set_q,libavutil),Cint,(Ptr{Void},Ptr{UInt8},AVRational,Cint),obj,name,val,search_flags) + ccall((:av_opt_set_q,libavutil),Cint,(Ptr{Cvoid},Ptr{UInt8},AVRational,Cint),obj,name,val,search_flags) end function av_opt_set_bin(obj,name,val,size::Integer,search_flags::Integer) - ccall((:av_opt_set_bin,libavutil),Cint,(Ptr{Void},Ptr{UInt8},Ptr{UInt8},Cint,Cint),obj,name,val,size,search_flags) + ccall((:av_opt_set_bin,libavutil),Cint,(Ptr{Cvoid},Ptr{UInt8},Ptr{UInt8},Cint,Cint),obj,name,val,size,search_flags) end function av_opt_set_image_size(obj,name,w::Integer,h::Integer,search_flags::Integer) - ccall((:av_opt_set_image_size,libavutil),Cint,(Ptr{Void},Ptr{UInt8},Cint,Cint,Cint),obj,name,w,h,search_flags) + ccall((:av_opt_set_image_size,libavutil),Cint,(Ptr{Cvoid},Ptr{UInt8},Cint,Cint,Cint),obj,name,w,h,search_flags) end function av_opt_set_pixel_fmt(obj,name,fmt::AVPixelFormat,search_flags::Integer) - ccall((:av_opt_set_pixel_fmt,libavutil),Cint,(Ptr{Void},Ptr{UInt8},AVPixelFormat,Cint),obj,name,fmt,search_flags) + ccall((:av_opt_set_pixel_fmt,libavutil),Cint,(Ptr{Cvoid},Ptr{UInt8},AVPixelFormat,Cint),obj,name,fmt,search_flags) end function av_opt_set_sample_fmt(obj,name,fmt::AVSampleFormat,search_flags::Integer) - ccall((:av_opt_set_sample_fmt,libavutil),Cint,(Ptr{Void},Ptr{UInt8},AVSampleFormat,Cint),obj,name,fmt,search_flags) + ccall((:av_opt_set_sample_fmt,libavutil),Cint,(Ptr{Cvoid},Ptr{UInt8},AVSampleFormat,Cint),obj,name,fmt,search_flags) end function av_opt_set_video_rate(obj,name,val::AVRational,search_flags::Integer) - ccall((:av_opt_set_video_rate,libavutil),Cint,(Ptr{Void},Ptr{UInt8},AVRational,Cint),obj,name,val,search_flags) + ccall((:av_opt_set_video_rate,libavutil),Cint,(Ptr{Cvoid},Ptr{UInt8},AVRational,Cint),obj,name,val,search_flags) end function av_opt_set_channel_layout(obj,name,ch_layout::Int64,search_flags::Integer) - ccall((:av_opt_set_channel_layout,libavutil),Cint,(Ptr{Void},Ptr{UInt8},Int64,Cint),obj,name,ch_layout,search_flags) + ccall((:av_opt_set_channel_layout,libavutil),Cint,(Ptr{Cvoid},Ptr{UInt8},Int64,Cint),obj,name,ch_layout,search_flags) end function av_opt_set_dict_val(obj,name,val,search_flags::Integer) - ccall((:av_opt_set_dict_val,libavutil),Cint,(Ptr{Void},Ptr{UInt8},Ptr{AVDictionary},Cint),obj,name,val,search_flags) + ccall((:av_opt_set_dict_val,libavutil),Cint,(Ptr{Cvoid},Ptr{UInt8},Ptr{AVDictionary},Cint),obj,name,val,search_flags) end function av_opt_get(obj,name,search_flags::Integer,out_val) - ccall((:av_opt_get,libavutil),Cint,(Ptr{Void},Ptr{UInt8},Cint,Ptr{Ptr{UInt8}}),obj,name,search_flags,out_val) + ccall((:av_opt_get,libavutil),Cint,(Ptr{Cvoid},Ptr{UInt8},Cint,Ptr{Ptr{UInt8}}),obj,name,search_flags,out_val) end function av_opt_get_int(obj,name,search_flags::Integer,out_val) - ccall((:av_opt_get_int,libavutil),Cint,(Ptr{Void},Ptr{UInt8},Cint,Ptr{Int64}),obj,name,search_flags,out_val) + ccall((:av_opt_get_int,libavutil),Cint,(Ptr{Cvoid},Ptr{UInt8},Cint,Ptr{Int64}),obj,name,search_flags,out_val) end function av_opt_get_double(obj,name,search_flags::Integer,out_val) - ccall((:av_opt_get_double,libavutil),Cint,(Ptr{Void},Ptr{UInt8},Cint,Ptr{Cdouble}),obj,name,search_flags,out_val) + ccall((:av_opt_get_double,libavutil),Cint,(Ptr{Cvoid},Ptr{UInt8},Cint,Ptr{Cdouble}),obj,name,search_flags,out_val) end function av_opt_get_q(obj,name,search_flags::Integer,out_val) - ccall((:av_opt_get_q,libavutil),Cint,(Ptr{Void},Ptr{UInt8},Cint,Ptr{AVRational}),obj,name,search_flags,out_val) + ccall((:av_opt_get_q,libavutil),Cint,(Ptr{Cvoid},Ptr{UInt8},Cint,Ptr{AVRational}),obj,name,search_flags,out_val) end function av_opt_get_image_size(obj,name,search_flags::Integer,w_out,h_out) - ccall((:av_opt_get_image_size,libavutil),Cint,(Ptr{Void},Ptr{UInt8},Cint,Ptr{Cint},Ptr{Cint}),obj,name,search_flags,w_out,h_out) + ccall((:av_opt_get_image_size,libavutil),Cint,(Ptr{Cvoid},Ptr{UInt8},Cint,Ptr{Cint},Ptr{Cint}),obj,name,search_flags,w_out,h_out) end function av_opt_get_pixel_fmt(obj,name,search_flags::Integer,out_fmt) - ccall((:av_opt_get_pixel_fmt,libavutil),Cint,(Ptr{Void},Ptr{UInt8},Cint,Ptr{AVPixelFormat}),obj,name,search_flags,out_fmt) + ccall((:av_opt_get_pixel_fmt,libavutil),Cint,(Ptr{Cvoid},Ptr{UInt8},Cint,Ptr{AVPixelFormat}),obj,name,search_flags,out_fmt) end function av_opt_get_sample_fmt(obj,name,search_flags::Integer,out_fmt) - ccall((:av_opt_get_sample_fmt,libavutil),Cint,(Ptr{Void},Ptr{UInt8},Cint,Ptr{AVSampleFormat}),obj,name,search_flags,out_fmt) + ccall((:av_opt_get_sample_fmt,libavutil),Cint,(Ptr{Cvoid},Ptr{UInt8},Cint,Ptr{AVSampleFormat}),obj,name,search_flags,out_fmt) end function av_opt_get_video_rate(obj,name,search_flags::Integer,out_val) - ccall((:av_opt_get_video_rate,libavutil),Cint,(Ptr{Void},Ptr{UInt8},Cint,Ptr{AVRational}),obj,name,search_flags,out_val) + ccall((:av_opt_get_video_rate,libavutil),Cint,(Ptr{Cvoid},Ptr{UInt8},Cint,Ptr{AVRational}),obj,name,search_flags,out_val) end function av_opt_get_channel_layout(obj,name,search_flags::Integer,ch_layout) - ccall((:av_opt_get_channel_layout,libavutil),Cint,(Ptr{Void},Ptr{UInt8},Cint,Ptr{Int64}),obj,name,search_flags,ch_layout) + ccall((:av_opt_get_channel_layout,libavutil),Cint,(Ptr{Cvoid},Ptr{UInt8},Cint,Ptr{Int64}),obj,name,search_flags,ch_layout) end function av_opt_get_dict_val(obj,name,search_flags::Integer,out_val) - ccall((:av_opt_get_dict_val,libavutil),Cint,(Ptr{Void},Ptr{UInt8},Cint,Ptr{Ptr{AVDictionary}}),obj,name,search_flags,out_val) + ccall((:av_opt_get_dict_val,libavutil),Cint,(Ptr{Cvoid},Ptr{UInt8},Cint,Ptr{Ptr{AVDictionary}}),obj,name,search_flags,out_val) end function av_opt_ptr(avclass,obj,name) - ccall((:av_opt_ptr,libavutil),Ptr{Void},(Ptr{AVClass},Ptr{Void},Ptr{UInt8}),avclass,obj,name) + ccall((:av_opt_ptr,libavutil),Ptr{Cvoid},(Ptr{AVClass},Ptr{Cvoid},Ptr{UInt8}),avclass,obj,name) end function av_opt_freep_ranges(ranges) - ccall((:av_opt_freep_ranges,libavutil),Void,(Ptr{Ptr{AVOptionRanges}},),ranges) + ccall((:av_opt_freep_ranges,libavutil),Cvoid,(Ptr{Ptr{AVOptionRanges}},),ranges) end function av_opt_query_ranges(arg1,obj,key,flags::Integer) - ccall((:av_opt_query_ranges,libavutil),Cint,(Ptr{Ptr{AVOptionRanges}},Ptr{Void},Ptr{UInt8},Cint),arg1,obj,key,flags) + ccall((:av_opt_query_ranges,libavutil),Cint,(Ptr{Ptr{AVOptionRanges}},Ptr{Cvoid},Ptr{UInt8},Cint),arg1,obj,key,flags) end function av_opt_copy(dest,src) - ccall((:av_opt_copy,libavutil),Cint,(Ptr{Void},Ptr{Void}),dest,src) + ccall((:av_opt_copy,libavutil),Cint,(Ptr{Cvoid},Ptr{Cvoid}),dest,src) end function av_opt_query_ranges_default(arg1,obj,key,flags::Integer) - ccall((:av_opt_query_ranges_default,libavutil),Cint,(Ptr{Ptr{AVOptionRanges}},Ptr{Void},Ptr{UInt8},Cint),arg1,obj,key,flags) + ccall((:av_opt_query_ranges_default,libavutil),Cint,(Ptr{Ptr{AVOptionRanges}},Ptr{Cvoid},Ptr{UInt8},Cint),arg1,obj,key,flags) end diff --git a/src/ffmpeg/AVUtil/v54/pixdesc.jl b/src/ffmpeg/AVUtil/v54/pixdesc.jl index ecfa4f70..9dace082 100644 --- a/src/ffmpeg/AVUtil/v54/pixdesc.jl +++ b/src/ffmpeg/AVUtil/v54/pixdesc.jl @@ -27,11 +27,11 @@ export function av_read_image_line(dst,data,linesize,desc,x::Integer,y::Integer,c::Integer,w::Integer,read_pal_component::Integer) - ccall((:av_read_image_line,libavutil),Void,(Ptr{UInt16},Ptr{Ptr{UInt8}},Ptr{Cint},Ptr{AVPixFmtDescriptor},Cint,Cint,Cint,Cint,Cint),dst,data,linesize,desc,x,y,c,w,read_pal_component) + ccall((:av_read_image_line,libavutil),Cvoid,(Ptr{UInt16},Ptr{Ptr{UInt8}},Ptr{Cint},Ptr{AVPixFmtDescriptor},Cint,Cint,Cint,Cint,Cint),dst,data,linesize,desc,x,y,c,w,read_pal_component) end function av_write_image_line(src,data,linesize,desc,x::Integer,y::Integer,c::Integer,w::Integer) - ccall((:av_write_image_line,libavutil),Void,(Ptr{UInt16},Ptr{Ptr{UInt8}},Ptr{Cint},Ptr{AVPixFmtDescriptor},Cint,Cint,Cint,Cint),src,data,linesize,desc,x,y,c,w) + ccall((:av_write_image_line,libavutil),Cvoid,(Ptr{UInt16},Ptr{Ptr{UInt8}},Ptr{Cint},Ptr{AVPixFmtDescriptor},Cint,Cint,Cint,Cint),src,data,linesize,desc,x,y,c,w) end function av_get_pix_fmt(name) @@ -75,7 +75,7 @@ function av_pix_fmt_count_planes(pix_fmt::AVPixelFormat) end function ff_check_pixfmt_descriptors() - ccall((:ff_check_pixfmt_descriptors,libavutil),Void,()) + ccall((:ff_check_pixfmt_descriptors,libavutil),Cvoid,()) end function av_pix_fmt_swap_endianness(pix_fmt::AVPixelFormat) diff --git a/src/ffmpeg/AVUtil/v54/pixelutils.jl b/src/ffmpeg/AVUtil/v54/pixelutils.jl index 0502a8b5..f63be153 100644 --- a/src/ffmpeg/AVUtil/v54/pixelutils.jl +++ b/src/ffmpeg/AVUtil/v54/pixelutils.jl @@ -7,5 +7,5 @@ export function av_pixelutils_get_sad_fn(w_bits::Integer,h_bits::Integer,aligned::Integer,log_ctx) - ccall((:av_pixelutils_get_sad_fn,libavutil),av_pixelutils_sad_fn,(Cint,Cint,Cint,Ptr{Void}),w_bits,h_bits,aligned,log_ctx) + ccall((:av_pixelutils_get_sad_fn,libavutil),av_pixelutils_sad_fn,(Cint,Cint,Cint,Ptr{Cvoid}),w_bits,h_bits,aligned,log_ctx) end diff --git a/src/ffmpeg/AVUtil/v54/threadmessage.jl b/src/ffmpeg/AVUtil/v54/threadmessage.jl index 8b1d7d2a..955112db 100644 --- a/src/ffmpeg/AVUtil/v54/threadmessage.jl +++ b/src/ffmpeg/AVUtil/v54/threadmessage.jl @@ -16,21 +16,21 @@ function av_thread_message_queue_alloc(mq,nelem::Integer,elsize::Integer) end function av_thread_message_queue_free(mq) - ccall((:av_thread_message_queue_free,libavutil),Void,(Ptr{Ptr{AVThreadMessageQueue}},),mq) + ccall((:av_thread_message_queue_free,libavutil),Cvoid,(Ptr{Ptr{AVThreadMessageQueue}},),mq) end function av_thread_message_queue_send(mq,msg,flags::Integer) - ccall((:av_thread_message_queue_send,libavutil),Cint,(Ptr{AVThreadMessageQueue},Ptr{Void},UInt32),mq,msg,flags) + ccall((:av_thread_message_queue_send,libavutil),Cint,(Ptr{AVThreadMessageQueue},Ptr{Cvoid},UInt32),mq,msg,flags) end function av_thread_message_queue_recv(mq,msg,flags::Integer) - ccall((:av_thread_message_queue_recv,libavutil),Cint,(Ptr{AVThreadMessageQueue},Ptr{Void},UInt32),mq,msg,flags) + ccall((:av_thread_message_queue_recv,libavutil),Cint,(Ptr{AVThreadMessageQueue},Ptr{Cvoid},UInt32),mq,msg,flags) end function av_thread_message_queue_set_err_send(mq,err::Integer) - ccall((:av_thread_message_queue_set_err_send,libavutil),Void,(Ptr{AVThreadMessageQueue},Cint),mq,err) + ccall((:av_thread_message_queue_set_err_send,libavutil),Cvoid,(Ptr{AVThreadMessageQueue},Cint),mq,err) end function av_thread_message_queue_set_err_recv(mq,err::Integer) - ccall((:av_thread_message_queue_set_err_recv,libavutil),Void,(Ptr{AVThreadMessageQueue},Cint),mq,err) + ccall((:av_thread_message_queue_set_err_recv,libavutil),Cvoid,(Ptr{AVThreadMessageQueue},Cint),mq,err) end diff --git a/src/ffmpeg/AVUtil/v54/timecode.jl b/src/ffmpeg/AVUtil/v54/timecode.jl index 17e8bb98..17d34548 100644 --- a/src/ffmpeg/AVUtil/v54/timecode.jl +++ b/src/ffmpeg/AVUtil/v54/timecode.jl @@ -34,11 +34,11 @@ function av_timecode_make_mpeg_tc_string(buf,tc25bit::Integer) end function av_timecode_init(tc,rate::AVRational,flags::Integer,frame_start::Integer,log_ctx) - ccall((:av_timecode_init,libavutil),Cint,(Ptr{AVTimecode},AVRational,Cint,Cint,Ptr{Void}),tc,rate,flags,frame_start,log_ctx) + ccall((:av_timecode_init,libavutil),Cint,(Ptr{AVTimecode},AVRational,Cint,Cint,Ptr{Cvoid}),tc,rate,flags,frame_start,log_ctx) end function av_timecode_init_from_string(tc,rate::AVRational,str,log_ctx) - ccall((:av_timecode_init_from_string,libavutil),Cint,(Ptr{AVTimecode},AVRational,Ptr{UInt8},Ptr{Void}),tc,rate,str,log_ctx) + ccall((:av_timecode_init_from_string,libavutil),Cint,(Ptr{AVTimecode},AVRational,Ptr{UInt8},Ptr{Cvoid}),tc,rate,str,log_ctx) end function av_timecode_check_frame_rate(rate::AVRational) diff --git a/src/ffmpeg/AVUtil/v54/xtea.jl b/src/ffmpeg/AVUtil/v54/xtea.jl index 5dff1e68..3b017282 100644 --- a/src/ffmpeg/AVUtil/v54/xtea.jl +++ b/src/ffmpeg/AVUtil/v54/xtea.jl @@ -8,9 +8,9 @@ export function av_xtea_init(ctx,key) - ccall((:av_xtea_init,libavutil),Void,(Ptr{AVXTEA},Ptr{UInt8}),ctx,key) + ccall((:av_xtea_init,libavutil),Cvoid,(Ptr{AVXTEA},Ptr{UInt8}),ctx,key) end function av_xtea_crypt(ctx,dst,src,count::Integer,iv,decrypt::Integer) - ccall((:av_xtea_crypt,libavutil),Void,(Ptr{AVXTEA},Ptr{UInt8},Ptr{UInt8},Cint,Ptr{UInt8},Cint),ctx,dst,src,count,iv,decrypt) + ccall((:av_xtea_crypt,libavutil),Cvoid,(Ptr{AVXTEA},Ptr{UInt8},Ptr{UInt8},Cint,Ptr{UInt8},Cint),ctx,dst,src,count,iv,decrypt) end diff --git a/src/ffmpeg/AVUtil/v55/aes_ctr.jl b/src/ffmpeg/AVUtil/v55/aes_ctr.jl index e9492c38..ecaeccde 100644 --- a/src/ffmpeg/AVUtil/v55/aes_ctr.jl +++ b/src/ffmpeg/AVUtil/v55/aes_ctr.jl @@ -22,11 +22,11 @@ function av_aes_ctr_init(a,key) end function av_aes_ctr_free(a) - ccall((:av_aes_ctr_free,libavutil),Void,(Ptr{AVAESCTR},),a) + ccall((:av_aes_ctr_free,libavutil),Cvoid,(Ptr{AVAESCTR},),a) end function av_aes_ctr_crypt(a,dst,src,size::Integer) - ccall((:av_aes_ctr_crypt,libavutil),Void,(Ptr{AVAESCTR},Ptr{UInt8},Ptr{UInt8},Cint),a,dst,src,size) + ccall((:av_aes_ctr_crypt,libavutil),Cvoid,(Ptr{AVAESCTR},Ptr{UInt8},Ptr{UInt8},Cint),a,dst,src,size) end function av_aes_ctr_get_iv(a) @@ -34,13 +34,13 @@ function av_aes_ctr_get_iv(a) end function av_aes_ctr_set_random_iv(a) - ccall((:av_aes_ctr_set_random_iv,libavutil),Void,(Ptr{AVAESCTR},),a) + ccall((:av_aes_ctr_set_random_iv,libavutil),Cvoid,(Ptr{AVAESCTR},),a) end function av_aes_ctr_set_iv(a,iv) - ccall((:av_aes_ctr_set_iv,libavutil),Void,(Ptr{AVAESCTR},Ptr{UInt8}),a,iv) + ccall((:av_aes_ctr_set_iv,libavutil),Cvoid,(Ptr{AVAESCTR},Ptr{UInt8}),a,iv) end function av_aes_ctr_increment_iv(a) - ccall((:av_aes_ctr_increment_iv,libavutil),Void,(Ptr{AVAESCTR},),a) + ccall((:av_aes_ctr_increment_iv,libavutil),Cvoid,(Ptr{AVAESCTR},),a) end diff --git a/src/ffmpeg/AVUtil/v55/audio_fifo.jl b/src/ffmpeg/AVUtil/v55/audio_fifo.jl index a54f06ba..ee5bd4ed 100644 --- a/src/ffmpeg/AVUtil/v55/audio_fifo.jl +++ b/src/ffmpeg/AVUtil/v55/audio_fifo.jl @@ -16,7 +16,7 @@ export function av_audio_fifo_free(af) - ccall((:av_audio_fifo_free,libavutil),Void,(Ptr{AVAudioFifo},),af) + ccall((:av_audio_fifo_free,libavutil),Cvoid,(Ptr{AVAudioFifo},),af) end function av_audio_fifo_alloc(sample_fmt::AVSampleFormat,channels::Integer,nb_samples::Integer) @@ -28,15 +28,15 @@ function av_audio_fifo_realloc(af,nb_samples::Integer) end function av_audio_fifo_write(af,data,nb_samples::Integer) - ccall((:av_audio_fifo_write,libavutil),Cint,(Ptr{AVAudioFifo},Ptr{Ptr{Void}},Cint),af,data,nb_samples) + ccall((:av_audio_fifo_write,libavutil),Cint,(Ptr{AVAudioFifo},Ptr{Ptr{Cvoid}},Cint),af,data,nb_samples) end function av_audio_fifo_peek(af,data,nb_samples::Integer) - ccall((:av_audio_fifo_peek,libavutil),Cint,(Ptr{AVAudioFifo},Ptr{Ptr{Void}},Cint),af,data,nb_samples) + ccall((:av_audio_fifo_peek,libavutil),Cint,(Ptr{AVAudioFifo},Ptr{Ptr{Cvoid}},Cint),af,data,nb_samples) end function av_audio_fifo_read(af,data,nb_samples::Integer) - ccall((:av_audio_fifo_read,libavutil),Cint,(Ptr{AVAudioFifo},Ptr{Ptr{Void}},Cint),af,data,nb_samples) + ccall((:av_audio_fifo_read,libavutil),Cint,(Ptr{AVAudioFifo},Ptr{Ptr{Cvoid}},Cint),af,data,nb_samples) end function av_audio_fifo_drain(af,nb_samples::Integer) @@ -44,7 +44,7 @@ function av_audio_fifo_drain(af,nb_samples::Integer) end function av_audio_fifo_reset(af) - ccall((:av_audio_fifo_reset,libavutil),Void,(Ptr{AVAudioFifo},),af) + ccall((:av_audio_fifo_reset,libavutil),Cvoid,(Ptr{AVAudioFifo},),af) end function av_audio_fifo_size(af) diff --git a/src/ffmpeg/AVUtil/v55/avutil.jl b/src/ffmpeg/AVUtil/v55/avutil.jl index f1ad6898..58dca972 100644 --- a/src/ffmpeg/AVUtil/v55/avutil.jl +++ b/src/ffmpeg/AVUtil/v55/avutil.jl @@ -40,15 +40,15 @@ function av_get_picture_type_char(pict_type::AVPictureType) end function av_x_if_null(p,x) - ccall((:av_x_if_null,libavutil),Ptr{Void},(Ptr{Void},Ptr{Void}),p,x) + ccall((:av_x_if_null,libavutil),Ptr{Cvoid},(Ptr{Cvoid},Ptr{Cvoid}),p,x) end function av_int_list_length_for_size(elsize::Integer,list,term::UInt64) - ccall((:av_int_list_length_for_size,libavutil),UInt32,(UInt32,Ptr{Void},UInt64),elsize,list,term) + ccall((:av_int_list_length_for_size,libavutil),UInt32,(UInt32,Ptr{Cvoid},UInt64),elsize,list,term) end function av_fopen_utf8(path,mode) - ccall((:av_fopen_utf8,libavutil),Ptr{Void},(Cstring,Cstring),path,mode) + ccall((:av_fopen_utf8,libavutil),Ptr{Cvoid},(Cstring,Cstring),path,mode) end function av_get_time_base_q() diff --git a/src/ffmpeg/AVUtil/v55/buffer.jl b/src/ffmpeg/AVUtil/v55/buffer.jl index 75f55391..1eb4ac58 100644 --- a/src/ffmpeg/AVUtil/v55/buffer.jl +++ b/src/ffmpeg/AVUtil/v55/buffer.jl @@ -28,11 +28,11 @@ function av_buffer_allocz(size::Integer) end function av_buffer_create(data,size::Integer,free,opaque,flags::Integer) - ccall((:av_buffer_create,libavutil),Ptr{AVBufferRef},(Ptr{UInt8},Cint,Ptr{Void},Ptr{Void},Cint),data,size,free,opaque,flags) + ccall((:av_buffer_create,libavutil),Ptr{AVBufferRef},(Ptr{UInt8},Cint,Ptr{Cvoid},Ptr{Cvoid},Cint),data,size,free,opaque,flags) end function av_buffer_default_free(opaque,data) - ccall((:av_buffer_default_free,libavutil),Void,(Ptr{Void},Ptr{UInt8}),opaque,data) + ccall((:av_buffer_default_free,libavutil),Cvoid,(Ptr{Cvoid},Ptr{UInt8}),opaque,data) end function av_buffer_ref(buf) @@ -40,7 +40,7 @@ function av_buffer_ref(buf) end function av_buffer_unref(buf) - ccall((:av_buffer_unref,libavutil),Void,(Ptr{Ptr{AVBufferRef}},),buf) + ccall((:av_buffer_unref,libavutil),Cvoid,(Ptr{Ptr{AVBufferRef}},),buf) end function av_buffer_is_writable(buf) @@ -48,7 +48,7 @@ function av_buffer_is_writable(buf) end function av_buffer_get_opaque(buf) - ccall((:av_buffer_get_opaque,libavutil),Ptr{Void},(Ptr{AVBufferRef},),buf) + ccall((:av_buffer_get_opaque,libavutil),Ptr{Cvoid},(Ptr{AVBufferRef},),buf) end function av_buffer_get_ref_count(buf) @@ -64,11 +64,11 @@ function av_buffer_realloc(buf,size::Integer) end function av_buffer_pool_init(size::Integer,alloc) - ccall((:av_buffer_pool_init,libavutil),Ptr{AVBufferPool},(Cint,Ptr{Void}),size,alloc) + ccall((:av_buffer_pool_init,libavutil),Ptr{AVBufferPool},(Cint,Ptr{Cvoid}),size,alloc) end function av_buffer_pool_uninit(pool) - ccall((:av_buffer_pool_uninit,libavutil),Void,(Ptr{Ptr{AVBufferPool}},),pool) + ccall((:av_buffer_pool_uninit,libavutil),Cvoid,(Ptr{Ptr{AVBufferPool}},),pool) end function av_buffer_pool_get(pool) diff --git a/src/ffmpeg/AVUtil/v55/camellia.jl b/src/ffmpeg/AVUtil/v55/camellia.jl index f8f70bd4..9c0fb74d 100644 --- a/src/ffmpeg/AVUtil/v55/camellia.jl +++ b/src/ffmpeg/AVUtil/v55/camellia.jl @@ -17,5 +17,5 @@ function av_camellia_init(ctx,key,key_bits::Integer) end function av_camellia_crypt(ctx,dst,src,count::Integer,iv,decrypt::Integer) - ccall((:av_camellia_crypt,libavutil),Void,(Ptr{AVCAMELLIA},Ptr{UInt8},Ptr{UInt8},Cint,Ptr{UInt8},Cint),ctx,dst,src,count,iv,decrypt) + ccall((:av_camellia_crypt,libavutil),Cvoid,(Ptr{AVCAMELLIA},Ptr{UInt8},Ptr{UInt8},Cint,Ptr{UInt8},Cint),ctx,dst,src,count,iv,decrypt) end diff --git a/src/ffmpeg/AVUtil/v55/cast5.jl b/src/ffmpeg/AVUtil/v55/cast5.jl index e6a5ecfc..20d8acd8 100644 --- a/src/ffmpeg/AVUtil/v55/cast5.jl +++ b/src/ffmpeg/AVUtil/v55/cast5.jl @@ -18,9 +18,9 @@ function av_cast5_init(ctx,key,key_bits::Integer) end function av_cast5_crypt(ctx,dst,src,count::Integer,decrypt::Integer) - ccall((:av_cast5_crypt,libavutil),Void,(Ptr{AVCAST5},Ptr{UInt8},Ptr{UInt8},Cint,Cint),ctx,dst,src,count,decrypt) + ccall((:av_cast5_crypt,libavutil),Cvoid,(Ptr{AVCAST5},Ptr{UInt8},Ptr{UInt8},Cint,Cint),ctx,dst,src,count,decrypt) end function av_cast5_crypt2(ctx,dst,src,count::Integer,iv,decrypt::Integer) - ccall((:av_cast5_crypt2,libavutil),Void,(Ptr{AVCAST5},Ptr{UInt8},Ptr{UInt8},Cint,Ptr{UInt8},Cint),ctx,dst,src,count,iv,decrypt) + ccall((:av_cast5_crypt2,libavutil),Cvoid,(Ptr{AVCAST5},Ptr{UInt8},Ptr{UInt8},Cint,Ptr{UInt8},Cint),ctx,dst,src,count,iv,decrypt) end diff --git a/src/ffmpeg/AVUtil/v55/channel_layout.jl b/src/ffmpeg/AVUtil/v55/channel_layout.jl index 528e54a4..0db3d4c1 100644 --- a/src/ffmpeg/AVUtil/v55/channel_layout.jl +++ b/src/ffmpeg/AVUtil/v55/channel_layout.jl @@ -20,11 +20,11 @@ function av_get_channel_layout(name) end function av_get_channel_layout_string(buf,buf_size::Integer,nb_channels::Integer,channel_layout::UInt64) - ccall((:av_get_channel_layout_string,libavutil),Void,(Cstring,Cint,Cint,UInt64),buf,buf_size,nb_channels,channel_layout) + ccall((:av_get_channel_layout_string,libavutil),Cvoid,(Cstring,Cint,Cint,UInt64),buf,buf_size,nb_channels,channel_layout) end function av_bprint_channel_layout(bp,nb_channels::Integer,channel_layout::UInt64) - ccall((:av_bprint_channel_layout,libavutil),Void,(Ptr{AVBPrint},Cint,UInt64),bp,nb_channels,channel_layout) + ccall((:av_bprint_channel_layout,libavutil),Cvoid,(Ptr{AVBPrint},Cint,UInt64),bp,nb_channels,channel_layout) end function av_get_channel_layout_nb_channels(channel_layout::UInt64) diff --git a/src/ffmpeg/AVUtil/v55/des.jl b/src/ffmpeg/AVUtil/v55/des.jl index 9946b84b..619c4e3c 100644 --- a/src/ffmpeg/AVUtil/v55/des.jl +++ b/src/ffmpeg/AVUtil/v55/des.jl @@ -18,9 +18,9 @@ function av_des_init(d,key,key_bits::Integer,decrypt::Integer) end function av_des_crypt(d,dst,src,count::Integer,iv,decrypt::Integer) - ccall((:av_des_crypt,libavutil),Void,(Ptr{AVDES},Ptr{UInt8},Ptr{UInt8},Cint,Ptr{UInt8},Cint),d,dst,src,count,iv,decrypt) + ccall((:av_des_crypt,libavutil),Cvoid,(Ptr{AVDES},Ptr{UInt8},Ptr{UInt8},Cint,Ptr{UInt8},Cint),d,dst,src,count,iv,decrypt) end function av_des_mac(d,dst,src,count::Integer) - ccall((:av_des_mac,libavutil),Void,(Ptr{AVDES},Ptr{UInt8},Ptr{UInt8},Cint),d,dst,src,count) + ccall((:av_des_mac,libavutil),Cvoid,(Ptr{AVDES},Ptr{UInt8},Ptr{UInt8},Cint),d,dst,src,count) end diff --git a/src/ffmpeg/AVUtil/v55/dict.jl b/src/ffmpeg/AVUtil/v55/dict.jl index 53a1bbb5..19ea4ad7 100644 --- a/src/ffmpeg/AVUtil/v55/dict.jl +++ b/src/ffmpeg/AVUtil/v55/dict.jl @@ -38,7 +38,7 @@ function av_dict_copy(dst,src,flags::Integer) end function av_dict_free(m) - ccall((:av_dict_free,libavutil),Void,(Ptr{Ptr{AVDictionary}},),m) + ccall((:av_dict_free,libavutil),Cvoid,(Ptr{Ptr{AVDictionary}},),m) end function av_dict_get_string(m,buffer,key_val_sep::UInt8,pairs_sep::UInt8) diff --git a/src/ffmpeg/AVUtil/v55/display.jl b/src/ffmpeg/AVUtil/v55/display.jl index 569152be..293093c9 100644 --- a/src/ffmpeg/AVUtil/v55/display.jl +++ b/src/ffmpeg/AVUtil/v55/display.jl @@ -13,9 +13,9 @@ function av_display_rotation_get(matrix::NTuple{9,Int32}) end function av_display_rotation_set(matrix::NTuple{9,Int32},angle::Cdouble) - ccall((:av_display_rotation_set,libavutil),Void,(NTuple{9,Int32},Cdouble),matrix,angle) + ccall((:av_display_rotation_set,libavutil),Cvoid,(NTuple{9,Int32},Cdouble),matrix,angle) end function av_display_matrix_flip(matrix::NTuple{9,Int32},hflip::Integer,vflip::Integer) - ccall((:av_display_matrix_flip,libavutil),Void,(NTuple{9,Int32},Cint,Cint),matrix,hflip,vflip) + ccall((:av_display_matrix_flip,libavutil),Cvoid,(NTuple{9,Int32},Cint,Cint),matrix,hflip,vflip) end diff --git a/src/ffmpeg/AVUtil/v55/fifo.jl b/src/ffmpeg/AVUtil/v55/fifo.jl index 1c4876f9..7bce4b70 100644 --- a/src/ffmpeg/AVUtil/v55/fifo.jl +++ b/src/ffmpeg/AVUtil/v55/fifo.jl @@ -29,15 +29,15 @@ function av_fifo_alloc_array(nmemb::Csize_t,size::Csize_t) end function av_fifo_free(f) - ccall((:av_fifo_free,libavutil),Void,(Ptr{AVFifoBuffer},),f) + ccall((:av_fifo_free,libavutil),Cvoid,(Ptr{AVFifoBuffer},),f) end function av_fifo_freep(f) - ccall((:av_fifo_freep,libavutil),Void,(Ptr{Ptr{AVFifoBuffer}},),f) + ccall((:av_fifo_freep,libavutil),Cvoid,(Ptr{Ptr{AVFifoBuffer}},),f) end function av_fifo_reset(f) - ccall((:av_fifo_reset,libavutil),Void,(Ptr{AVFifoBuffer},),f) + ccall((:av_fifo_reset,libavutil),Cvoid,(Ptr{AVFifoBuffer},),f) end function av_fifo_size(f) @@ -49,19 +49,19 @@ function av_fifo_space(f) end function av_fifo_generic_peek_at(f,dest,offset::Integer,buf_size::Integer,func) - ccall((:av_fifo_generic_peek_at,libavutil),Cint,(Ptr{AVFifoBuffer},Ptr{Void},Cint,Cint,Ptr{Void}),f,dest,offset,buf_size,func) + ccall((:av_fifo_generic_peek_at,libavutil),Cint,(Ptr{AVFifoBuffer},Ptr{Cvoid},Cint,Cint,Ptr{Cvoid}),f,dest,offset,buf_size,func) end function av_fifo_generic_peek(f,dest,buf_size::Integer,func) - ccall((:av_fifo_generic_peek,libavutil),Cint,(Ptr{AVFifoBuffer},Ptr{Void},Cint,Ptr{Void}),f,dest,buf_size,func) + ccall((:av_fifo_generic_peek,libavutil),Cint,(Ptr{AVFifoBuffer},Ptr{Cvoid},Cint,Ptr{Cvoid}),f,dest,buf_size,func) end function av_fifo_generic_read(f,dest,buf_size::Integer,func) - ccall((:av_fifo_generic_read,libavutil),Cint,(Ptr{AVFifoBuffer},Ptr{Void},Cint,Ptr{Void}),f,dest,buf_size,func) + ccall((:av_fifo_generic_read,libavutil),Cint,(Ptr{AVFifoBuffer},Ptr{Cvoid},Cint,Ptr{Cvoid}),f,dest,buf_size,func) end function av_fifo_generic_write(f,src,size::Integer,func) - ccall((:av_fifo_generic_write,libavutil),Cint,(Ptr{AVFifoBuffer},Ptr{Void},Cint,Ptr{Void}),f,src,size,func) + ccall((:av_fifo_generic_write,libavutil),Cint,(Ptr{AVFifoBuffer},Ptr{Cvoid},Cint,Ptr{Cvoid}),f,src,size,func) end function av_fifo_realloc2(f,size::Integer) @@ -73,7 +73,7 @@ function av_fifo_grow(f,additional_space::Integer) end function av_fifo_drain(f,size::Integer) - ccall((:av_fifo_drain,libavutil),Void,(Ptr{AVFifoBuffer},Cint),f,size) + ccall((:av_fifo_drain,libavutil),Cvoid,(Ptr{AVFifoBuffer},Cint),f,size) end function av_fifo_peek2(f,offs::Integer) diff --git a/src/ffmpeg/AVUtil/v55/file.jl b/src/ffmpeg/AVUtil/v55/file.jl index 207bd80e..ceacc30c 100644 --- a/src/ffmpeg/AVUtil/v55/file.jl +++ b/src/ffmpeg/AVUtil/v55/file.jl @@ -9,13 +9,13 @@ export function av_file_map(filename,bufptr,size,log_offset::Integer,log_ctx) - ccall((:av_file_map,libavutil),Cint,(Cstring,Ptr{Ptr{UInt8}},Ptr{Csize_t},Cint,Ptr{Void}),filename,bufptr,size,log_offset,log_ctx) + ccall((:av_file_map,libavutil),Cint,(Cstring,Ptr{Ptr{UInt8}},Ptr{Csize_t},Cint,Ptr{Cvoid}),filename,bufptr,size,log_offset,log_ctx) end function av_file_unmap(bufptr,size::Csize_t) - ccall((:av_file_unmap,libavutil),Void,(Ptr{UInt8},Csize_t),bufptr,size) + ccall((:av_file_unmap,libavutil),Cvoid,(Ptr{UInt8},Csize_t),bufptr,size) end function av_tempfile(prefix,filename,log_offset::Integer,log_ctx) - ccall((:av_tempfile,libavutil),Cint,(Cstring,Ptr{Cstring},Cint,Ptr{Void}),prefix,filename,log_offset,log_ctx) + ccall((:av_tempfile,libavutil),Cint,(Cstring,Ptr{Cstring},Cint,Ptr{Cvoid}),prefix,filename,log_offset,log_ctx) end diff --git a/src/ffmpeg/AVUtil/v55/frame.jl b/src/ffmpeg/AVUtil/v55/frame.jl index f265f8ff..c78b7d2b 100644 --- a/src/ffmpeg/AVUtil/v55/frame.jl +++ b/src/ffmpeg/AVUtil/v55/frame.jl @@ -52,7 +52,7 @@ function av_frame_get_best_effort_timestamp(frame) end function av_frame_set_best_effort_timestamp(frame,val::Int64) - ccall((:av_frame_set_best_effort_timestamp,libavutil),Void,(Ptr{AVFrame},Int64),frame,val) + ccall((:av_frame_set_best_effort_timestamp,libavutil),Cvoid,(Ptr{AVFrame},Int64),frame,val) end function av_frame_get_pkt_duration(frame) @@ -60,7 +60,7 @@ function av_frame_get_pkt_duration(frame) end function av_frame_set_pkt_duration(frame,val::Int64) - ccall((:av_frame_set_pkt_duration,libavutil),Void,(Ptr{AVFrame},Int64),frame,val) + ccall((:av_frame_set_pkt_duration,libavutil),Cvoid,(Ptr{AVFrame},Int64),frame,val) end function av_frame_get_pkt_pos(frame) @@ -68,7 +68,7 @@ function av_frame_get_pkt_pos(frame) end function av_frame_set_pkt_pos(frame,val::Int64) - ccall((:av_frame_set_pkt_pos,libavutil),Void,(Ptr{AVFrame},Int64),frame,val) + ccall((:av_frame_set_pkt_pos,libavutil),Cvoid,(Ptr{AVFrame},Int64),frame,val) end function av_frame_get_channel_layout(frame) @@ -76,7 +76,7 @@ function av_frame_get_channel_layout(frame) end function av_frame_set_channel_layout(frame,val::Int64) - ccall((:av_frame_set_channel_layout,libavutil),Void,(Ptr{AVFrame},Int64),frame,val) + ccall((:av_frame_set_channel_layout,libavutil),Cvoid,(Ptr{AVFrame},Int64),frame,val) end function av_frame_get_channels(frame) @@ -84,7 +84,7 @@ function av_frame_get_channels(frame) end function av_frame_set_channels(frame,val::Integer) - ccall((:av_frame_set_channels,libavutil),Void,(Ptr{AVFrame},Cint),frame,val) + ccall((:av_frame_set_channels,libavutil),Cvoid,(Ptr{AVFrame},Cint),frame,val) end function av_frame_get_sample_rate(frame) @@ -92,7 +92,7 @@ function av_frame_get_sample_rate(frame) end function av_frame_set_sample_rate(frame,val::Integer) - ccall((:av_frame_set_sample_rate,libavutil),Void,(Ptr{AVFrame},Cint),frame,val) + ccall((:av_frame_set_sample_rate,libavutil),Cvoid,(Ptr{AVFrame},Cint),frame,val) end function av_frame_get_metadata(frame) @@ -100,7 +100,7 @@ function av_frame_get_metadata(frame) end function av_frame_set_metadata(frame,val) - ccall((:av_frame_set_metadata,libavutil),Void,(Ptr{AVFrame},Ptr{AVDictionary}),frame,val) + ccall((:av_frame_set_metadata,libavutil),Cvoid,(Ptr{AVFrame},Ptr{AVDictionary}),frame,val) end function av_frame_get_decode_error_flags(frame) @@ -108,7 +108,7 @@ function av_frame_get_decode_error_flags(frame) end function av_frame_set_decode_error_flags(frame,val::Integer) - ccall((:av_frame_set_decode_error_flags,libavutil),Void,(Ptr{AVFrame},Cint),frame,val) + ccall((:av_frame_set_decode_error_flags,libavutil),Cvoid,(Ptr{AVFrame},Cint),frame,val) end function av_frame_get_pkt_size(frame) @@ -116,7 +116,7 @@ function av_frame_get_pkt_size(frame) end function av_frame_set_pkt_size(frame,val::Integer) - ccall((:av_frame_set_pkt_size,libavutil),Void,(Ptr{AVFrame},Cint),frame,val) + ccall((:av_frame_set_pkt_size,libavutil),Cvoid,(Ptr{AVFrame},Cint),frame,val) end function avpriv_frame_get_metadatap(frame) @@ -136,7 +136,7 @@ function av_frame_get_colorspace(frame) end function av_frame_set_colorspace(frame,val::AVColorSpace) - ccall((:av_frame_set_colorspace,libavutil),Void,(Ptr{AVFrame},AVColorSpace),frame,val) + ccall((:av_frame_set_colorspace,libavutil),Cvoid,(Ptr{AVFrame},AVColorSpace),frame,val) end function av_frame_get_color_range(frame) @@ -144,7 +144,7 @@ function av_frame_get_color_range(frame) end function av_frame_set_color_range(frame,val::AVColorRange) - ccall((:av_frame_set_color_range,libavutil),Void,(Ptr{AVFrame},AVColorRange),frame,val) + ccall((:av_frame_set_color_range,libavutil),Cvoid,(Ptr{AVFrame},AVColorRange),frame,val) end function av_get_colorspace_name(val::AVColorSpace) @@ -156,7 +156,7 @@ function av_frame_alloc() end function av_frame_free(frame) - ccall((:av_frame_free,libavutil),Void,(Ptr{Ptr{AVFrame}},),frame) + ccall((:av_frame_free,libavutil),Cvoid,(Ptr{Ptr{AVFrame}},),frame) end function av_frame_ref(dst,src) @@ -168,11 +168,11 @@ function av_frame_clone(src) end function av_frame_unref(frame) - ccall((:av_frame_unref,libavutil),Void,(Ptr{AVFrame},),frame) + ccall((:av_frame_unref,libavutil),Cvoid,(Ptr{AVFrame},),frame) end function av_frame_move_ref(dst,src) - ccall((:av_frame_move_ref,libavutil),Void,(Ptr{AVFrame},Ptr{AVFrame}),dst,src) + ccall((:av_frame_move_ref,libavutil),Cvoid,(Ptr{AVFrame},Ptr{AVFrame}),dst,src) end function av_frame_get_buffer(frame,align::Integer) @@ -208,7 +208,7 @@ function av_frame_get_side_data(frame,_type::AVFrameSideDataType) end function av_frame_remove_side_data(frame,_type::AVFrameSideDataType) - ccall((:av_frame_remove_side_data,libavutil),Void,(Ptr{AVFrame},AVFrameSideDataType),frame,_type) + ccall((:av_frame_remove_side_data,libavutil),Cvoid,(Ptr{AVFrame},AVFrameSideDataType),frame,_type) end function av_frame_side_data_name(_type::AVFrameSideDataType) diff --git a/src/ffmpeg/AVUtil/v55/hash.jl b/src/ffmpeg/AVUtil/v55/hash.jl index e49eaae1..8f10102e 100644 --- a/src/ffmpeg/AVUtil/v55/hash.jl +++ b/src/ffmpeg/AVUtil/v55/hash.jl @@ -33,29 +33,29 @@ function av_hash_get_size(ctx) end function av_hash_init(ctx) - ccall((:av_hash_init,libavutil),Void,(Ptr{AVHashContext},),ctx) + ccall((:av_hash_init,libavutil),Cvoid,(Ptr{AVHashContext},),ctx) end function av_hash_update(ctx,src,len::Integer) - ccall((:av_hash_update,libavutil),Void,(Ptr{AVHashContext},Ptr{UInt8},Cint),ctx,src,len) + ccall((:av_hash_update,libavutil),Cvoid,(Ptr{AVHashContext},Ptr{UInt8},Cint),ctx,src,len) end function av_hash_final(ctx,dst) - ccall((:av_hash_final,libavutil),Void,(Ptr{AVHashContext},Ptr{UInt8}),ctx,dst) + ccall((:av_hash_final,libavutil),Cvoid,(Ptr{AVHashContext},Ptr{UInt8}),ctx,dst) end function av_hash_final_bin(ctx,dst,size::Integer) - ccall((:av_hash_final_bin,libavutil),Void,(Ptr{AVHashContext},Ptr{UInt8},Cint),ctx,dst,size) + ccall((:av_hash_final_bin,libavutil),Cvoid,(Ptr{AVHashContext},Ptr{UInt8},Cint),ctx,dst,size) end function av_hash_final_hex(ctx,dst,size::Integer) - ccall((:av_hash_final_hex,libavutil),Void,(Ptr{AVHashContext},Ptr{UInt8},Cint),ctx,dst,size) + ccall((:av_hash_final_hex,libavutil),Cvoid,(Ptr{AVHashContext},Ptr{UInt8},Cint),ctx,dst,size) end function av_hash_final_b64(ctx,dst,size::Integer) - ccall((:av_hash_final_b64,libavutil),Void,(Ptr{AVHashContext},Ptr{UInt8},Cint),ctx,dst,size) + ccall((:av_hash_final_b64,libavutil),Cvoid,(Ptr{AVHashContext},Ptr{UInt8},Cint),ctx,dst,size) end function av_hash_freep(ctx) - ccall((:av_hash_freep,libavutil),Void,(Ptr{Ptr{AVHashContext}},),ctx) + ccall((:av_hash_freep,libavutil),Cvoid,(Ptr{Ptr{AVHashContext}},),ctx) end diff --git a/src/ffmpeg/AVUtil/v55/imgutils.jl b/src/ffmpeg/AVUtil/v55/imgutils.jl index fe5da698..b8ab4a30 100644 --- a/src/ffmpeg/AVUtil/v55/imgutils.jl +++ b/src/ffmpeg/AVUtil/v55/imgutils.jl @@ -18,7 +18,7 @@ export function av_image_fill_max_pixsteps(max_pixsteps::NTuple{4,Cint},max_pixstep_comps::NTuple{4,Cint},pixdesc) - ccall((:av_image_fill_max_pixsteps,libavutil),Void,(NTuple{4,Cint},NTuple{4,Cint},Ptr{AVPixFmtDescriptor}),max_pixsteps,max_pixstep_comps,pixdesc) + ccall((:av_image_fill_max_pixsteps,libavutil),Cvoid,(NTuple{4,Cint},NTuple{4,Cint},Ptr{AVPixFmtDescriptor}),max_pixsteps,max_pixstep_comps,pixdesc) end function av_image_get_linesize(pix_fmt::AVPixelFormat,width::Integer,plane::Integer) @@ -38,11 +38,11 @@ function av_image_alloc(pointers::NTuple{4,Ptr{UInt8}},linesizes::NTuple{4,Cint} end function av_image_copy_plane(dst,dst_linesize::Integer,src,src_linesize::Integer,bytewidth::Integer,height::Integer) - ccall((:av_image_copy_plane,libavutil),Void,(Ptr{UInt8},Cint,Ptr{UInt8},Cint,Cint,Cint),dst,dst_linesize,src,src_linesize,bytewidth,height) + ccall((:av_image_copy_plane,libavutil),Cvoid,(Ptr{UInt8},Cint,Ptr{UInt8},Cint,Cint,Cint),dst,dst_linesize,src,src_linesize,bytewidth,height) end function av_image_copy(dst_data::NTuple{4,Ptr{UInt8}},dst_linesizes::NTuple{4,Cint},src_data::NTuple{4,Ptr{UInt8}},src_linesizes::NTuple{4,Cint},pix_fmt::AVPixelFormat,width::Integer,height::Integer) - ccall((:av_image_copy,libavutil),Void,(NTuple{4,Ptr{UInt8}},NTuple{4,Cint},NTuple{4,Ptr{UInt8}},NTuple{4,Cint},AVPixelFormat,Cint,Cint),dst_data,dst_linesizes,src_data,src_linesizes,pix_fmt,width,height) + ccall((:av_image_copy,libavutil),Cvoid,(NTuple{4,Ptr{UInt8}},NTuple{4,Cint},NTuple{4,Ptr{UInt8}},NTuple{4,Cint},AVPixelFormat,Cint,Cint),dst_data,dst_linesizes,src_data,src_linesizes,pix_fmt,width,height) end function av_image_fill_arrays(dst_data::NTuple{4,Ptr{UInt8}},dst_linesize::NTuple{4,Cint},src,pix_fmt::AVPixelFormat,width::Integer,height::Integer,align::Integer) @@ -58,7 +58,7 @@ function av_image_copy_to_buffer(dst,dst_size::Integer,src_data::NTuple{4,Ptr{UI end function av_image_check_size(w::Integer,h::Integer,log_offset::Integer,log_ctx) - ccall((:av_image_check_size,libavutil),Cint,(UInt32,UInt32,Cint,Ptr{Void}),w,h,log_offset,log_ctx) + ccall((:av_image_check_size,libavutil),Cint,(UInt32,UInt32,Cint,Ptr{Cvoid}),w,h,log_offset,log_ctx) end function av_image_check_sar(w::Integer,h::Integer,sar::AVRational) diff --git a/src/ffmpeg/AVUtil/v55/libavutil_h.jl b/src/ffmpeg/AVUtil/v55/libavutil_h.jl index 0307d580..b920e69a 100644 --- a/src/ffmpeg/AVUtil/v55/libavutil_h.jl +++ b/src/ffmpeg/AVUtil/v55/libavutil_h.jl @@ -578,7 +578,7 @@ const AV_PICTURE_TYPE_BI = (UInt32)(7) const AV_BUFFER_FLAG_READONLY = 1 << 0 -const AVBuffer = Void +const AVBuffer = Nothing struct AVBufferRef buffer::Ptr{AVBuffer} @@ -586,7 +586,7 @@ struct AVBufferRef size::Cint end -const AVBufferPool = Void +const AVBufferPool = Nothing const AV_DICT_MATCH_CASE = 1 const AV_DICT_IGNORE_SUFFIX = 2 @@ -600,7 +600,7 @@ struct AVDictionaryEntry value::Cstring end -const AVDictionary = Void +const AVDictionary = Nothing struct AVFifoBuffer buffer::Ptr{UInt8} @@ -752,7 +752,7 @@ struct AVFrame coded_picture_number::Cint display_picture_number::Cint quality::Cint - opaque::Ptr{Void} + opaque::Ptr{Cvoid} error::NTuple{8,UInt64} repeat_pict::Cint interlaced_frame::Cint @@ -891,7 +891,7 @@ struct AVOption help::Cstring offset::Cint _type::AVOptionType - default_val::Void + default_val::Nothing min::Cdouble max::Cdouble flags::Cint @@ -900,16 +900,16 @@ end struct AVClass class_name::Cstring - item_name::Ptr{Void} + item_name::Ptr{Cvoid} option::Ptr{AVOption} version::Cint log_level_offset_offset::Cint parent_log_context_offset::Cint - child_next::Ptr{Void} - child_class_next::Ptr{Void} + child_next::Ptr{Cvoid} + child_class_next::Ptr{Cvoid} category::AVClassCategory - get_category::Ptr{Void} - query_ranges::Ptr{Void} + get_category::Ptr{Cvoid} + query_ranges::Ptr{Cvoid} end # Skipping MacroDefinition: DECLARE_ALIGNED ( n , t , v ) t __attribute__ ( ( aligned ( n ) ) ) v @@ -1247,10 +1247,10 @@ const LIBAVUTIL_VERSION_MICRO = 103 const AES_CTR_KEY_SIZE = 16 const AES_CTR_IV_SIZE = 8 -const AVAESCTR = Void -const AVAudioFifo = Void -const AVCAMELLIA = Void -const AVCAST5 = Void +const AVAESCTR = Nothing +const AVAudioFifo = Nothing +const AVCAMELLIA = Nothing +const AVCAST5 = Nothing const AV_CH_FRONT_LEFT = 0x00000001 const AV_CH_FRONT_RIGHT = 0x00000002 @@ -1319,7 +1319,7 @@ const AV_MATRIX_ENCODING_DOLBYHEADPHONE = (UInt32)(6) const AV_MATRIX_ENCODING_NB = (UInt32)(7) # end enum AVMatrixEncoding -const AVBPrint = Void +const AVBPrint = Nothing struct AVDES round_keys::NTuple{3,NTuple{16,UInt64}} @@ -1346,7 +1346,7 @@ end const AV_HASH_MAX_SIZE = 64 -const AVHashContext = Void +const AVHashContext = Nothing struct AVMasteringDisplayMetadata display_primaries::NTuple{3,NTuple{2,AVRational}} @@ -1426,7 +1426,7 @@ const ANONYMOUS_2 = UInt32 const AV_OPT_FLAG_IMPLICIT_KEY = (UInt32)(1) # end enum ANONYMOUS_2 -const av_pixelutils_sad_fn = Ptr{Void} +const av_pixelutils_sad_fn = Ptr{Cvoid} struct AVRC4 state::NTuple{256,UInt8} @@ -1460,8 +1460,8 @@ struct AVStereo3D flags::Cint end -const AVTEA = Void -const AVThreadMessageQueue = Void +const AVTEA = Nothing +const AVThreadMessageQueue = Nothing # begin enum AVThreadMessageFlags const AVThreadMessageFlags = UInt32 @@ -1484,8 +1484,8 @@ struct AVTimecode fps::UInt32 end -const AVTreeNode = Void -const AVTWOFISH = Void +const AVTreeNode = Nothing +const AVTWOFISH = Nothing struct AVXTEA key::NTuple{16,UInt32} diff --git a/src/ffmpeg/AVUtil/v55/log.jl b/src/ffmpeg/AVUtil/v55/log.jl index 115963da..3e4e62d5 100644 --- a/src/ffmpeg/AVUtil/v55/log.jl +++ b/src/ffmpeg/AVUtil/v55/log.jl @@ -24,11 +24,11 @@ function av_log_get_level() end function av_log_set_level(level::Integer) - ccall((:av_log_set_level,libavutil),Void,(Cint,),level) + ccall((:av_log_set_level,libavutil),Cvoid,(Cint,),level) end function av_log_set_callback(callback) - ccall((:av_log_set_callback,libavutil),Void,(Ptr{Void},),callback) + ccall((:av_log_set_callback,libavutil),Cvoid,(Ptr{Cvoid},),callback) end # function av_log_default_callback(avcl,level::Integer,fmt,vl) @@ -36,11 +36,11 @@ end # end function av_default_item_name(ctx) - ccall((:av_default_item_name,libavutil),Cstring,(Ptr{Void},),ctx) + ccall((:av_default_item_name,libavutil),Cstring,(Ptr{Cvoid},),ctx) end function av_default_get_category(ptr) - ccall((:av_default_get_category,libavutil),AVClassCategory,(Ptr{Void},),ptr) + ccall((:av_default_get_category,libavutil),AVClassCategory,(Ptr{Cvoid},),ptr) end # function av_log_format_line(ptr,level::Integer,fmt,vl,line,line_size::Integer,print_prefix) @@ -48,7 +48,7 @@ end # end function av_log_set_flags(arg::Integer) - ccall((:av_log_set_flags,libavutil),Void,(Cint,),arg) + ccall((:av_log_set_flags,libavutil),Cvoid,(Cint,),arg) end function av_log_get_flags() diff --git a/src/ffmpeg/AVUtil/v55/mem.jl b/src/ffmpeg/AVUtil/v55/mem.jl index 9f88fb82..edbf5395 100644 --- a/src/ffmpeg/AVUtil/v55/mem.jl +++ b/src/ffmpeg/AVUtil/v55/mem.jl @@ -30,47 +30,47 @@ export function av_malloc(size::Csize_t) - ccall((:av_malloc,libavutil),Ptr{Void},(Csize_t,),size) + ccall((:av_malloc,libavutil),Ptr{Cvoid},(Csize_t,),size) end function av_malloc_array(nmemb::Csize_t,size::Csize_t) - ccall((:av_malloc_array,libavutil),Ptr{Void},(Csize_t,Csize_t),nmemb,size) + ccall((:av_malloc_array,libavutil),Ptr{Cvoid},(Csize_t,Csize_t),nmemb,size) end function av_realloc(ptr,size::Csize_t) - ccall((:av_realloc,libavutil),Ptr{Void},(Ptr{Void},Csize_t),ptr,size) + ccall((:av_realloc,libavutil),Ptr{Cvoid},(Ptr{Cvoid},Csize_t),ptr,size) end function av_realloc_f(ptr,nelem::Csize_t,elsize::Csize_t) - ccall((:av_realloc_f,libavutil),Ptr{Void},(Ptr{Void},Csize_t,Csize_t),ptr,nelem,elsize) + ccall((:av_realloc_f,libavutil),Ptr{Cvoid},(Ptr{Cvoid},Csize_t,Csize_t),ptr,nelem,elsize) end function av_reallocp(ptr,size::Csize_t) - ccall((:av_reallocp,libavutil),Cint,(Ptr{Void},Csize_t),ptr,size) + ccall((:av_reallocp,libavutil),Cint,(Ptr{Cvoid},Csize_t),ptr,size) end function av_realloc_array(ptr,nmemb::Csize_t,size::Csize_t) - ccall((:av_realloc_array,libavutil),Ptr{Void},(Ptr{Void},Csize_t,Csize_t),ptr,nmemb,size) + ccall((:av_realloc_array,libavutil),Ptr{Cvoid},(Ptr{Cvoid},Csize_t,Csize_t),ptr,nmemb,size) end function av_reallocp_array(ptr,nmemb::Csize_t,size::Csize_t) - ccall((:av_reallocp_array,libavutil),Cint,(Ptr{Void},Csize_t,Csize_t),ptr,nmemb,size) + ccall((:av_reallocp_array,libavutil),Cint,(Ptr{Cvoid},Csize_t,Csize_t),ptr,nmemb,size) end function av_free(ptr) - ccall((:av_free,libavutil),Void,(Ptr{Void},),ptr) + ccall((:av_free,libavutil),Cvoid,(Ptr{Cvoid},),ptr) end function av_mallocz(size::Csize_t) - ccall((:av_mallocz,libavutil),Ptr{Void},(Csize_t,),size) + ccall((:av_mallocz,libavutil),Ptr{Cvoid},(Csize_t,),size) end function av_calloc(nmemb::Csize_t,size::Csize_t) - ccall((:av_calloc,libavutil),Ptr{Void},(Csize_t,Csize_t),nmemb,size) + ccall((:av_calloc,libavutil),Ptr{Cvoid},(Csize_t,Csize_t),nmemb,size) end function av_mallocz_array(nmemb::Csize_t,size::Csize_t) - ccall((:av_mallocz_array,libavutil),Ptr{Void},(Csize_t,Csize_t),nmemb,size) + ccall((:av_mallocz_array,libavutil),Ptr{Cvoid},(Csize_t,Csize_t),nmemb,size) end function av_strdup(s) @@ -82,23 +82,23 @@ function av_strndup(s,len::Csize_t) end function av_memdup(p,size::Csize_t) - ccall((:av_memdup,libavutil),Ptr{Void},(Ptr{Void},Csize_t),p,size) + ccall((:av_memdup,libavutil),Ptr{Cvoid},(Ptr{Cvoid},Csize_t),p,size) end function av_freep(ptr) - ccall((:av_freep,libavutil),Void,(Ptr{Void},),ptr) + ccall((:av_freep,libavutil),Cvoid,(Ptr{Cvoid},),ptr) end function av_dynarray_add(tab_ptr,nb_ptr,elem) - ccall((:av_dynarray_add,libavutil),Void,(Ptr{Void},Ptr{Cint},Ptr{Void}),tab_ptr,nb_ptr,elem) + ccall((:av_dynarray_add,libavutil),Cvoid,(Ptr{Cvoid},Ptr{Cint},Ptr{Cvoid}),tab_ptr,nb_ptr,elem) end function av_dynarray_add_nofree(tab_ptr,nb_ptr,elem) - ccall((:av_dynarray_add_nofree,libavutil),Cint,(Ptr{Void},Ptr{Cint},Ptr{Void}),tab_ptr,nb_ptr,elem) + ccall((:av_dynarray_add_nofree,libavutil),Cint,(Ptr{Cvoid},Ptr{Cint},Ptr{Cvoid}),tab_ptr,nb_ptr,elem) end function av_dynarray2_add(tab_ptr,nb_ptr,elem_size::Csize_t,elem_data) - ccall((:av_dynarray2_add,libavutil),Ptr{Void},(Ptr{Ptr{Void}},Ptr{Cint},Csize_t,Ptr{UInt8}),tab_ptr,nb_ptr,elem_size,elem_data) + ccall((:av_dynarray2_add,libavutil),Ptr{Cvoid},(Ptr{Ptr{Cvoid}},Ptr{Cint},Csize_t,Ptr{UInt8}),tab_ptr,nb_ptr,elem_size,elem_data) end function av_size_mult(a::Csize_t,b::Csize_t,r) @@ -106,21 +106,21 @@ function av_size_mult(a::Csize_t,b::Csize_t,r) end function av_max_alloc(max::Csize_t) - ccall((:av_max_alloc,libavutil),Void,(Csize_t,),max) + ccall((:av_max_alloc,libavutil),Cvoid,(Csize_t,),max) end function av_memcpy_backptr(dst,back::Integer,cnt::Integer) - ccall((:av_memcpy_backptr,libavutil),Void,(Ptr{UInt8},Cint,Cint),dst,back,cnt) + ccall((:av_memcpy_backptr,libavutil),Cvoid,(Ptr{UInt8},Cint,Cint),dst,back,cnt) end function av_fast_realloc(ptr,size,min_size::Csize_t) - ccall((:av_fast_realloc,libavutil),Ptr{Void},(Ptr{Void},Ptr{UInt32},Csize_t),ptr,size,min_size) + ccall((:av_fast_realloc,libavutil),Ptr{Cvoid},(Ptr{Cvoid},Ptr{UInt32},Csize_t),ptr,size,min_size) end function av_fast_malloc(ptr,size,min_size::Csize_t) - ccall((:av_fast_malloc,libavutil),Void,(Ptr{Void},Ptr{UInt32},Csize_t),ptr,size,min_size) + ccall((:av_fast_malloc,libavutil),Cvoid,(Ptr{Cvoid},Ptr{UInt32},Csize_t),ptr,size,min_size) end function av_fast_mallocz(ptr,size,min_size::Csize_t) - ccall((:av_fast_mallocz,libavutil),Void,(Ptr{Void},Ptr{UInt32},Csize_t),ptr,size,min_size) + ccall((:av_fast_mallocz,libavutil),Cvoid,(Ptr{Cvoid},Ptr{UInt32},Csize_t),ptr,size,min_size) end diff --git a/src/ffmpeg/AVUtil/v55/opencl.jl b/src/ffmpeg/AVUtil/v55/opencl.jl index 3ea1ee2d..e057ce95 100644 --- a/src/ffmpeg/AVUtil/v55/opencl.jl +++ b/src/ffmpeg/AVUtil/v55/opencl.jl @@ -30,7 +30,7 @@ function av_opencl_get_device_list(device_list) end function av_opencl_free_device_list(device_list) - ccall((:av_opencl_free_device_list,libavutil),Void,(Ptr{Ptr{AVOpenCLDeviceList}},),device_list) + ccall((:av_opencl_free_device_list,libavutil),Cvoid,(Ptr{Ptr{AVOpenCLDeviceList}},),device_list) end function av_opencl_set_option(key,val) @@ -42,7 +42,7 @@ function av_opencl_get_option(key,out_val) end function av_opencl_free_option() - ccall((:av_opencl_free_option,libavutil),Void,()) + ccall((:av_opencl_free_option,libavutil),Cvoid,()) end function av_opencl_alloc_external_env() @@ -50,7 +50,7 @@ function av_opencl_alloc_external_env() end function av_opencl_free_external_env(ext_opencl_env) - ccall((:av_opencl_free_external_env,libavutil),Void,(Ptr{Ptr{AVOpenCLExternalEnv}},),ext_opencl_env) + ccall((:av_opencl_free_external_env,libavutil),Cvoid,(Ptr{Ptr{AVOpenCLExternalEnv}},),ext_opencl_env) end function av_opencl_errstr(status::cl_int) @@ -74,7 +74,7 @@ function av_opencl_get_command_queue() end function av_opencl_buffer_create(cl_buf,cl_buf_size::Csize_t,flags::Integer,host_ptr) - ccall((:av_opencl_buffer_create,libavutil),Cint,(Ptr{cl_mem},Csize_t,Cint,Ptr{Void}),cl_buf,cl_buf_size,flags,host_ptr) + ccall((:av_opencl_buffer_create,libavutil),Cint,(Ptr{cl_mem},Csize_t,Cint,Ptr{Cvoid}),cl_buf,cl_buf_size,flags,host_ptr) end function av_opencl_buffer_write(dst_cl_buf::cl_mem,src_buf,buf_size::Csize_t) @@ -94,13 +94,13 @@ function av_opencl_buffer_read_image(dst_data,plane_size,plane_num::Integer,src_ end function av_opencl_buffer_release(cl_buf) - ccall((:av_opencl_buffer_release,libavutil),Void,(Ptr{cl_mem},),cl_buf) + ccall((:av_opencl_buffer_release,libavutil),Cvoid,(Ptr{cl_mem},),cl_buf) end function av_opencl_uninit() - ccall((:av_opencl_uninit,libavutil),Void,()) + ccall((:av_opencl_uninit,libavutil),Cvoid,()) end function av_opencl_benchmark(device,platform::cl_platform_id,benchmark) - ccall((:av_opencl_benchmark,libavutil),Int64,(Ptr{AVOpenCLDeviceNode},cl_platform_id,Ptr{Void}),device,platform,benchmark) + ccall((:av_opencl_benchmark,libavutil),Int64,(Ptr{AVOpenCLDeviceNode},cl_platform_id,Ptr{Cvoid}),device,platform,benchmark) end diff --git a/src/ffmpeg/AVUtil/v55/opt.jl b/src/ffmpeg/AVUtil/v55/opt.jl index 3042887e..cf7e89d7 100644 --- a/src/ffmpeg/AVUtil/v55/opt.jl +++ b/src/ffmpeg/AVUtil/v55/opt.jl @@ -56,39 +56,39 @@ export function av_opt_show2(obj,av_log_obj,req_flags::Integer,rej_flags::Integer) - ccall((:av_opt_show2,libavutil),Cint,(Ptr{Void},Ptr{Void},Cint,Cint),obj,av_log_obj,req_flags,rej_flags) + ccall((:av_opt_show2,libavutil),Cint,(Ptr{Cvoid},Ptr{Cvoid},Cint,Cint),obj,av_log_obj,req_flags,rej_flags) end function av_opt_set_defaults(s) - ccall((:av_opt_set_defaults,libavutil),Void,(Ptr{Void},),s) + ccall((:av_opt_set_defaults,libavutil),Cvoid,(Ptr{Cvoid},),s) end function av_opt_set_defaults2(s,mask::Integer,flags::Integer) - ccall((:av_opt_set_defaults2,libavutil),Void,(Ptr{Void},Cint,Cint),s,mask,flags) + ccall((:av_opt_set_defaults2,libavutil),Cvoid,(Ptr{Cvoid},Cint,Cint),s,mask,flags) end function av_set_options_string(ctx,opts,key_val_sep,pairs_sep) - ccall((:av_set_options_string,libavutil),Cint,(Ptr{Void},Cstring,Cstring,Cstring),ctx,opts,key_val_sep,pairs_sep) + ccall((:av_set_options_string,libavutil),Cint,(Ptr{Cvoid},Cstring,Cstring,Cstring),ctx,opts,key_val_sep,pairs_sep) end function av_opt_set_from_string(ctx,opts,shorthand,key_val_sep,pairs_sep) - ccall((:av_opt_set_from_string,libavutil),Cint,(Ptr{Void},Cstring,Ptr{Cstring},Cstring,Cstring),ctx,opts,shorthand,key_val_sep,pairs_sep) + ccall((:av_opt_set_from_string,libavutil),Cint,(Ptr{Cvoid},Cstring,Ptr{Cstring},Cstring,Cstring),ctx,opts,shorthand,key_val_sep,pairs_sep) end function av_opt_free(obj) - ccall((:av_opt_free,libavutil),Void,(Ptr{Void},),obj) + ccall((:av_opt_free,libavutil),Cvoid,(Ptr{Cvoid},),obj) end function av_opt_flag_is_set(obj,field_name,flag_name) - ccall((:av_opt_flag_is_set,libavutil),Cint,(Ptr{Void},Cstring,Cstring),obj,field_name,flag_name) + ccall((:av_opt_flag_is_set,libavutil),Cint,(Ptr{Cvoid},Cstring,Cstring),obj,field_name,flag_name) end function av_opt_set_dict(obj,options) - ccall((:av_opt_set_dict,libavutil),Cint,(Ptr{Void},Ptr{Ptr{AVDictionary}}),obj,options) + ccall((:av_opt_set_dict,libavutil),Cint,(Ptr{Cvoid},Ptr{Ptr{AVDictionary}}),obj,options) end function av_opt_set_dict2(obj,options,search_flags::Integer) - ccall((:av_opt_set_dict2,libavutil),Cint,(Ptr{Void},Ptr{Ptr{AVDictionary}},Cint),obj,options,search_flags) + ccall((:av_opt_set_dict2,libavutil),Cint,(Ptr{Cvoid},Ptr{Ptr{AVDictionary}},Cint),obj,options,search_flags) end function av_opt_get_key_value(ropts,key_val_sep,pairs_sep,flags::Integer,rkey,rval) @@ -96,43 +96,43 @@ function av_opt_get_key_value(ropts,key_val_sep,pairs_sep,flags::Integer,rkey,rv end function av_opt_eval_flags(obj,o,val,flags_out) - ccall((:av_opt_eval_flags,libavutil),Cint,(Ptr{Void},Ptr{AVOption},Cstring,Ptr{Cint}),obj,o,val,flags_out) + ccall((:av_opt_eval_flags,libavutil),Cint,(Ptr{Cvoid},Ptr{AVOption},Cstring,Ptr{Cint}),obj,o,val,flags_out) end function av_opt_eval_int(obj,o,val,int_out) - ccall((:av_opt_eval_int,libavutil),Cint,(Ptr{Void},Ptr{AVOption},Cstring,Ptr{Cint}),obj,o,val,int_out) + ccall((:av_opt_eval_int,libavutil),Cint,(Ptr{Cvoid},Ptr{AVOption},Cstring,Ptr{Cint}),obj,o,val,int_out) end function av_opt_eval_int64(obj,o,val,int64_out) - ccall((:av_opt_eval_int64,libavutil),Cint,(Ptr{Void},Ptr{AVOption},Cstring,Ptr{Int64}),obj,o,val,int64_out) + ccall((:av_opt_eval_int64,libavutil),Cint,(Ptr{Cvoid},Ptr{AVOption},Cstring,Ptr{Int64}),obj,o,val,int64_out) end function av_opt_eval_float(obj,o,val,float_out) - ccall((:av_opt_eval_float,libavutil),Cint,(Ptr{Void},Ptr{AVOption},Cstring,Ptr{Cfloat}),obj,o,val,float_out) + ccall((:av_opt_eval_float,libavutil),Cint,(Ptr{Cvoid},Ptr{AVOption},Cstring,Ptr{Cfloat}),obj,o,val,float_out) end function av_opt_eval_double(obj,o,val,double_out) - ccall((:av_opt_eval_double,libavutil),Cint,(Ptr{Void},Ptr{AVOption},Cstring,Ptr{Cdouble}),obj,o,val,double_out) + ccall((:av_opt_eval_double,libavutil),Cint,(Ptr{Cvoid},Ptr{AVOption},Cstring,Ptr{Cdouble}),obj,o,val,double_out) end function av_opt_eval_q(obj,o,val,q_out) - ccall((:av_opt_eval_q,libavutil),Cint,(Ptr{Void},Ptr{AVOption},Cstring,Ptr{AVRational}),obj,o,val,q_out) + ccall((:av_opt_eval_q,libavutil),Cint,(Ptr{Cvoid},Ptr{AVOption},Cstring,Ptr{AVRational}),obj,o,val,q_out) end function av_opt_find(obj,name,unit,opt_flags::Integer,search_flags::Integer) - ccall((:av_opt_find,libavutil),Ptr{AVOption},(Ptr{Void},Cstring,Cstring,Cint,Cint),obj,name,unit,opt_flags,search_flags) + ccall((:av_opt_find,libavutil),Ptr{AVOption},(Ptr{Cvoid},Cstring,Cstring,Cint,Cint),obj,name,unit,opt_flags,search_flags) end function av_opt_find2(obj,name,unit,opt_flags::Integer,search_flags::Integer,target_obj) - ccall((:av_opt_find2,libavutil),Ptr{AVOption},(Ptr{Void},Cstring,Cstring,Cint,Cint,Ptr{Ptr{Void}}),obj,name,unit,opt_flags,search_flags,target_obj) + ccall((:av_opt_find2,libavutil),Ptr{AVOption},(Ptr{Cvoid},Cstring,Cstring,Cint,Cint,Ptr{Ptr{Cvoid}}),obj,name,unit,opt_flags,search_flags,target_obj) end function av_opt_next(obj,prev) - ccall((:av_opt_next,libavutil),Ptr{AVOption},(Ptr{Void},Ptr{AVOption}),obj,prev) + ccall((:av_opt_next,libavutil),Ptr{AVOption},(Ptr{Cvoid},Ptr{AVOption}),obj,prev) end function av_opt_child_next(obj,prev) - ccall((:av_opt_child_next,libavutil),Ptr{Void},(Ptr{Void},Ptr{Void}),obj,prev) + ccall((:av_opt_child_next,libavutil),Ptr{Cvoid},(Ptr{Cvoid},Ptr{Cvoid}),obj,prev) end function av_opt_child_class_next(parent,prev) @@ -140,117 +140,117 @@ function av_opt_child_class_next(parent,prev) end function av_opt_set(obj,name,val,search_flags::Integer) - ccall((:av_opt_set,libavutil),Cint,(Ptr{Void},Cstring,Cstring,Cint),obj,name,val,search_flags) + ccall((:av_opt_set,libavutil),Cint,(Ptr{Cvoid},Cstring,Cstring,Cint),obj,name,val,search_flags) end function av_opt_set_int(obj,name,val::Int64,search_flags::Integer) - ccall((:av_opt_set_int,libavutil),Cint,(Ptr{Void},Cstring,Int64,Cint),obj,name,val,search_flags) + ccall((:av_opt_set_int,libavutil),Cint,(Ptr{Cvoid},Cstring,Int64,Cint),obj,name,val,search_flags) end function av_opt_set_double(obj,name,val::Cdouble,search_flags::Integer) - ccall((:av_opt_set_double,libavutil),Cint,(Ptr{Void},Cstring,Cdouble,Cint),obj,name,val,search_flags) + ccall((:av_opt_set_double,libavutil),Cint,(Ptr{Cvoid},Cstring,Cdouble,Cint),obj,name,val,search_flags) end function av_opt_set_q(obj,name,val::AVRational,search_flags::Integer) - ccall((:av_opt_set_q,libavutil),Cint,(Ptr{Void},Cstring,AVRational,Cint),obj,name,val,search_flags) + ccall((:av_opt_set_q,libavutil),Cint,(Ptr{Cvoid},Cstring,AVRational,Cint),obj,name,val,search_flags) end function av_opt_set_bin(obj,name,val,size::Integer,search_flags::Integer) - ccall((:av_opt_set_bin,libavutil),Cint,(Ptr{Void},Cstring,Ptr{UInt8},Cint,Cint),obj,name,val,size,search_flags) + ccall((:av_opt_set_bin,libavutil),Cint,(Ptr{Cvoid},Cstring,Ptr{UInt8},Cint,Cint),obj,name,val,size,search_flags) end function av_opt_set_image_size(obj,name,w::Integer,h::Integer,search_flags::Integer) - ccall((:av_opt_set_image_size,libavutil),Cint,(Ptr{Void},Cstring,Cint,Cint,Cint),obj,name,w,h,search_flags) + ccall((:av_opt_set_image_size,libavutil),Cint,(Ptr{Cvoid},Cstring,Cint,Cint,Cint),obj,name,w,h,search_flags) end function av_opt_set_pixel_fmt(obj,name,fmt::AVPixelFormat,search_flags::Integer) - ccall((:av_opt_set_pixel_fmt,libavutil),Cint,(Ptr{Void},Cstring,AVPixelFormat,Cint),obj,name,fmt,search_flags) + ccall((:av_opt_set_pixel_fmt,libavutil),Cint,(Ptr{Cvoid},Cstring,AVPixelFormat,Cint),obj,name,fmt,search_flags) end function av_opt_set_sample_fmt(obj,name,fmt::AVSampleFormat,search_flags::Integer) - ccall((:av_opt_set_sample_fmt,libavutil),Cint,(Ptr{Void},Cstring,AVSampleFormat,Cint),obj,name,fmt,search_flags) + ccall((:av_opt_set_sample_fmt,libavutil),Cint,(Ptr{Cvoid},Cstring,AVSampleFormat,Cint),obj,name,fmt,search_flags) end function av_opt_set_video_rate(obj,name,val::AVRational,search_flags::Integer) - ccall((:av_opt_set_video_rate,libavutil),Cint,(Ptr{Void},Cstring,AVRational,Cint),obj,name,val,search_flags) + ccall((:av_opt_set_video_rate,libavutil),Cint,(Ptr{Cvoid},Cstring,AVRational,Cint),obj,name,val,search_flags) end function av_opt_set_channel_layout(obj,name,ch_layout::Int64,search_flags::Integer) - ccall((:av_opt_set_channel_layout,libavutil),Cint,(Ptr{Void},Cstring,Int64,Cint),obj,name,ch_layout,search_flags) + ccall((:av_opt_set_channel_layout,libavutil),Cint,(Ptr{Cvoid},Cstring,Int64,Cint),obj,name,ch_layout,search_flags) end function av_opt_set_dict_val(obj,name,val,search_flags::Integer) - ccall((:av_opt_set_dict_val,libavutil),Cint,(Ptr{Void},Cstring,Ptr{AVDictionary},Cint),obj,name,val,search_flags) + ccall((:av_opt_set_dict_val,libavutil),Cint,(Ptr{Cvoid},Cstring,Ptr{AVDictionary},Cint),obj,name,val,search_flags) end function av_opt_get(obj,name,search_flags::Integer,out_val) - ccall((:av_opt_get,libavutil),Cint,(Ptr{Void},Cstring,Cint,Ptr{Ptr{UInt8}}),obj,name,search_flags,out_val) + ccall((:av_opt_get,libavutil),Cint,(Ptr{Cvoid},Cstring,Cint,Ptr{Ptr{UInt8}}),obj,name,search_flags,out_val) end function av_opt_get_int(obj,name,search_flags::Integer,out_val) - ccall((:av_opt_get_int,libavutil),Cint,(Ptr{Void},Cstring,Cint,Ptr{Int64}),obj,name,search_flags,out_val) + ccall((:av_opt_get_int,libavutil),Cint,(Ptr{Cvoid},Cstring,Cint,Ptr{Int64}),obj,name,search_flags,out_val) end function av_opt_get_double(obj,name,search_flags::Integer,out_val) - ccall((:av_opt_get_double,libavutil),Cint,(Ptr{Void},Cstring,Cint,Ptr{Cdouble}),obj,name,search_flags,out_val) + ccall((:av_opt_get_double,libavutil),Cint,(Ptr{Cvoid},Cstring,Cint,Ptr{Cdouble}),obj,name,search_flags,out_val) end function av_opt_get_q(obj,name,search_flags::Integer,out_val) - ccall((:av_opt_get_q,libavutil),Cint,(Ptr{Void},Cstring,Cint,Ptr{AVRational}),obj,name,search_flags,out_val) + ccall((:av_opt_get_q,libavutil),Cint,(Ptr{Cvoid},Cstring,Cint,Ptr{AVRational}),obj,name,search_flags,out_val) end function av_opt_get_image_size(obj,name,search_flags::Integer,w_out,h_out) - ccall((:av_opt_get_image_size,libavutil),Cint,(Ptr{Void},Cstring,Cint,Ptr{Cint},Ptr{Cint}),obj,name,search_flags,w_out,h_out) + ccall((:av_opt_get_image_size,libavutil),Cint,(Ptr{Cvoid},Cstring,Cint,Ptr{Cint},Ptr{Cint}),obj,name,search_flags,w_out,h_out) end function av_opt_get_pixel_fmt(obj,name,search_flags::Integer,out_fmt) - ccall((:av_opt_get_pixel_fmt,libavutil),Cint,(Ptr{Void},Cstring,Cint,Ptr{AVPixelFormat}),obj,name,search_flags,out_fmt) + ccall((:av_opt_get_pixel_fmt,libavutil),Cint,(Ptr{Cvoid},Cstring,Cint,Ptr{AVPixelFormat}),obj,name,search_flags,out_fmt) end function av_opt_get_sample_fmt(obj,name,search_flags::Integer,out_fmt) - ccall((:av_opt_get_sample_fmt,libavutil),Cint,(Ptr{Void},Cstring,Cint,Ptr{AVSampleFormat}),obj,name,search_flags,out_fmt) + ccall((:av_opt_get_sample_fmt,libavutil),Cint,(Ptr{Cvoid},Cstring,Cint,Ptr{AVSampleFormat}),obj,name,search_flags,out_fmt) end function av_opt_get_video_rate(obj,name,search_flags::Integer,out_val) - ccall((:av_opt_get_video_rate,libavutil),Cint,(Ptr{Void},Cstring,Cint,Ptr{AVRational}),obj,name,search_flags,out_val) + ccall((:av_opt_get_video_rate,libavutil),Cint,(Ptr{Cvoid},Cstring,Cint,Ptr{AVRational}),obj,name,search_flags,out_val) end function av_opt_get_channel_layout(obj,name,search_flags::Integer,ch_layout) - ccall((:av_opt_get_channel_layout,libavutil),Cint,(Ptr{Void},Cstring,Cint,Ptr{Int64}),obj,name,search_flags,ch_layout) + ccall((:av_opt_get_channel_layout,libavutil),Cint,(Ptr{Cvoid},Cstring,Cint,Ptr{Int64}),obj,name,search_flags,ch_layout) end function av_opt_get_dict_val(obj,name,search_flags::Integer,out_val) - ccall((:av_opt_get_dict_val,libavutil),Cint,(Ptr{Void},Cstring,Cint,Ptr{Ptr{AVDictionary}}),obj,name,search_flags,out_val) + ccall((:av_opt_get_dict_val,libavutil),Cint,(Ptr{Cvoid},Cstring,Cint,Ptr{Ptr{AVDictionary}}),obj,name,search_flags,out_val) end function av_opt_ptr(avclass,obj,name) - ccall((:av_opt_ptr,libavutil),Ptr{Void},(Ptr{AVClass},Ptr{Void},Cstring),avclass,obj,name) + ccall((:av_opt_ptr,libavutil),Ptr{Cvoid},(Ptr{AVClass},Ptr{Cvoid},Cstring),avclass,obj,name) end function av_opt_freep_ranges(ranges) - ccall((:av_opt_freep_ranges,libavutil),Void,(Ptr{Ptr{AVOptionRanges}},),ranges) + ccall((:av_opt_freep_ranges,libavutil),Cvoid,(Ptr{Ptr{AVOptionRanges}},),ranges) end function av_opt_query_ranges(arg1,obj,key,flags::Integer) - ccall((:av_opt_query_ranges,libavutil),Cint,(Ptr{Ptr{AVOptionRanges}},Ptr{Void},Cstring,Cint),arg1,obj,key,flags) + ccall((:av_opt_query_ranges,libavutil),Cint,(Ptr{Ptr{AVOptionRanges}},Ptr{Cvoid},Cstring,Cint),arg1,obj,key,flags) end function av_opt_copy(dest,src) - ccall((:av_opt_copy,libavutil),Cint,(Ptr{Void},Ptr{Void}),dest,src) + ccall((:av_opt_copy,libavutil),Cint,(Ptr{Cvoid},Ptr{Cvoid}),dest,src) end function av_opt_query_ranges_default(arg1,obj,key,flags::Integer) - ccall((:av_opt_query_ranges_default,libavutil),Cint,(Ptr{Ptr{AVOptionRanges}},Ptr{Void},Cstring,Cint),arg1,obj,key,flags) + ccall((:av_opt_query_ranges_default,libavutil),Cint,(Ptr{Ptr{AVOptionRanges}},Ptr{Cvoid},Cstring,Cint),arg1,obj,key,flags) end function av_opt_is_set_to_default(obj,o) - ccall((:av_opt_is_set_to_default,libavutil),Cint,(Ptr{Void},Ptr{AVOption}),obj,o) + ccall((:av_opt_is_set_to_default,libavutil),Cint,(Ptr{Cvoid},Ptr{AVOption}),obj,o) end function av_opt_is_set_to_default_by_name(obj,name,search_flags::Integer) - ccall((:av_opt_is_set_to_default_by_name,libavutil),Cint,(Ptr{Void},Cstring,Cint),obj,name,search_flags) + ccall((:av_opt_is_set_to_default_by_name,libavutil),Cint,(Ptr{Cvoid},Cstring,Cint),obj,name,search_flags) end function av_opt_serialize(obj,opt_flags::Integer,flags::Integer,buffer,key_val_sep::UInt8,pairs_sep::UInt8) - ccall((:av_opt_serialize,libavutil),Cint,(Ptr{Void},Cint,Cint,Ptr{Cstring},UInt8,UInt8),obj,opt_flags,flags,buffer,key_val_sep,pairs_sep) + ccall((:av_opt_serialize,libavutil),Cint,(Ptr{Cvoid},Cint,Cint,Ptr{Cstring},UInt8,UInt8),obj,opt_flags,flags,buffer,key_val_sep,pairs_sep) end diff --git a/src/ffmpeg/AVUtil/v55/pixdesc.jl b/src/ffmpeg/AVUtil/v55/pixdesc.jl index 46567228..362bc764 100644 --- a/src/ffmpeg/AVUtil/v55/pixdesc.jl +++ b/src/ffmpeg/AVUtil/v55/pixdesc.jl @@ -26,11 +26,11 @@ export function av_read_image_line(dst,data::NTuple{4,Ptr{UInt8}},linesize::NTuple{4,Cint},desc,x::Integer,y::Integer,c::Integer,w::Integer,read_pal_component::Integer) - ccall((:av_read_image_line,libavutil),Void,(Ptr{UInt16},NTuple{4,Ptr{UInt8}},NTuple{4,Cint},Ptr{AVPixFmtDescriptor},Cint,Cint,Cint,Cint,Cint),dst,data,linesize,desc,x,y,c,w,read_pal_component) + ccall((:av_read_image_line,libavutil),Cvoid,(Ptr{UInt16},NTuple{4,Ptr{UInt8}},NTuple{4,Cint},Ptr{AVPixFmtDescriptor},Cint,Cint,Cint,Cint,Cint),dst,data,linesize,desc,x,y,c,w,read_pal_component) end function av_write_image_line(src,data::NTuple{4,Ptr{UInt8}},linesize::NTuple{4,Cint},desc,x::Integer,y::Integer,c::Integer,w::Integer) - ccall((:av_write_image_line,libavutil),Void,(Ptr{UInt16},NTuple{4,Ptr{UInt8}},NTuple{4,Cint},Ptr{AVPixFmtDescriptor},Cint,Cint,Cint,Cint),src,data,linesize,desc,x,y,c,w) + ccall((:av_write_image_line,libavutil),Cvoid,(Ptr{UInt16},NTuple{4,Ptr{UInt8}},NTuple{4,Cint},Ptr{AVPixFmtDescriptor},Cint,Cint,Cint,Cint),src,data,linesize,desc,x,y,c,w) end function av_get_pix_fmt(name) diff --git a/src/ffmpeg/AVUtil/v55/pixelutils.jl b/src/ffmpeg/AVUtil/v55/pixelutils.jl index fe37634f..8262390e 100644 --- a/src/ffmpeg/AVUtil/v55/pixelutils.jl +++ b/src/ffmpeg/AVUtil/v55/pixelutils.jl @@ -7,5 +7,5 @@ export function av_pixelutils_get_sad_fn(w_bits::Integer,h_bits::Integer,aligned::Integer,log_ctx) - ccall((:av_pixelutils_get_sad_fn,libavutil),av_pixelutils_sad_fn,(Cint,Cint,Cint,Ptr{Void}),w_bits,h_bits,aligned,log_ctx) + ccall((:av_pixelutils_get_sad_fn,libavutil),av_pixelutils_sad_fn,(Cint,Cint,Cint,Ptr{Cvoid}),w_bits,h_bits,aligned,log_ctx) end diff --git a/src/ffmpeg/AVUtil/v55/rc4.jl b/src/ffmpeg/AVUtil/v55/rc4.jl index d473492e..78089d8d 100644 --- a/src/ffmpeg/AVUtil/v55/rc4.jl +++ b/src/ffmpeg/AVUtil/v55/rc4.jl @@ -17,5 +17,5 @@ function av_rc4_init(d,key,key_bits::Integer,decrypt::Integer) end function av_rc4_crypt(d,dst,src,count::Integer,iv,decrypt::Integer) - ccall((:av_rc4_crypt,libavutil),Void,(Ptr{AVRC4},Ptr{UInt8},Ptr{UInt8},Cint,Ptr{UInt8},Cint),d,dst,src,count,iv,decrypt) + ccall((:av_rc4_crypt,libavutil),Cvoid,(Ptr{AVRC4},Ptr{UInt8},Ptr{UInt8},Cint,Ptr{UInt8},Cint),d,dst,src,count,iv,decrypt) end diff --git a/src/ffmpeg/AVUtil/v55/tea.jl b/src/ffmpeg/AVUtil/v55/tea.jl index 628e819e..fa2b6f32 100644 --- a/src/ffmpeg/AVUtil/v55/tea.jl +++ b/src/ffmpeg/AVUtil/v55/tea.jl @@ -13,9 +13,9 @@ function av_tea_alloc() end function av_tea_init(ctx,key::NTuple{16,UInt8},rounds::Integer) - ccall((:av_tea_init,libavutil),Void,(Ptr{AVTEA},NTuple{16,UInt8},Cint),ctx,key,rounds) + ccall((:av_tea_init,libavutil),Cvoid,(Ptr{AVTEA},NTuple{16,UInt8},Cint),ctx,key,rounds) end function av_tea_crypt(ctx,dst,src,count::Integer,iv,decrypt::Integer) - ccall((:av_tea_crypt,libavutil),Void,(Ptr{AVTEA},Ptr{UInt8},Ptr{UInt8},Cint,Ptr{UInt8},Cint),ctx,dst,src,count,iv,decrypt) + ccall((:av_tea_crypt,libavutil),Cvoid,(Ptr{AVTEA},Ptr{UInt8},Ptr{UInt8},Cint,Ptr{UInt8},Cint),ctx,dst,src,count,iv,decrypt) end diff --git a/src/ffmpeg/AVUtil/v55/threadmessage.jl b/src/ffmpeg/AVUtil/v55/threadmessage.jl index 204774ff..5907ea56 100644 --- a/src/ffmpeg/AVUtil/v55/threadmessage.jl +++ b/src/ffmpeg/AVUtil/v55/threadmessage.jl @@ -18,29 +18,29 @@ function av_thread_message_queue_alloc(mq,nelem::Integer,elsize::Integer) end function av_thread_message_queue_free(mq) - ccall((:av_thread_message_queue_free,libavutil),Void,(Ptr{Ptr{AVThreadMessageQueue}},),mq) + ccall((:av_thread_message_queue_free,libavutil),Cvoid,(Ptr{Ptr{AVThreadMessageQueue}},),mq) end function av_thread_message_queue_send(mq,msg,flags::Integer) - ccall((:av_thread_message_queue_send,libavutil),Cint,(Ptr{AVThreadMessageQueue},Ptr{Void},UInt32),mq,msg,flags) + ccall((:av_thread_message_queue_send,libavutil),Cint,(Ptr{AVThreadMessageQueue},Ptr{Cvoid},UInt32),mq,msg,flags) end function av_thread_message_queue_recv(mq,msg,flags::Integer) - ccall((:av_thread_message_queue_recv,libavutil),Cint,(Ptr{AVThreadMessageQueue},Ptr{Void},UInt32),mq,msg,flags) + ccall((:av_thread_message_queue_recv,libavutil),Cint,(Ptr{AVThreadMessageQueue},Ptr{Cvoid},UInt32),mq,msg,flags) end function av_thread_message_queue_set_err_send(mq,err::Integer) - ccall((:av_thread_message_queue_set_err_send,libavutil),Void,(Ptr{AVThreadMessageQueue},Cint),mq,err) + ccall((:av_thread_message_queue_set_err_send,libavutil),Cvoid,(Ptr{AVThreadMessageQueue},Cint),mq,err) end function av_thread_message_queue_set_err_recv(mq,err::Integer) - ccall((:av_thread_message_queue_set_err_recv,libavutil),Void,(Ptr{AVThreadMessageQueue},Cint),mq,err) + ccall((:av_thread_message_queue_set_err_recv,libavutil),Cvoid,(Ptr{AVThreadMessageQueue},Cint),mq,err) end function av_thread_message_queue_set_free_func(mq,free_func) - ccall((:av_thread_message_queue_set_free_func,libavutil),Void,(Ptr{AVThreadMessageQueue},Ptr{Void}),mq,free_func) + ccall((:av_thread_message_queue_set_free_func,libavutil),Cvoid,(Ptr{AVThreadMessageQueue},Ptr{Cvoid}),mq,free_func) end function av_thread_message_flush(mq) - ccall((:av_thread_message_flush,libavutil),Void,(Ptr{AVThreadMessageQueue},),mq) + ccall((:av_thread_message_flush,libavutil),Cvoid,(Ptr{AVThreadMessageQueue},),mq) end diff --git a/src/ffmpeg/AVUtil/v55/timecode.jl b/src/ffmpeg/AVUtil/v55/timecode.jl index c7e453b8..6e1e366e 100644 --- a/src/ffmpeg/AVUtil/v55/timecode.jl +++ b/src/ffmpeg/AVUtil/v55/timecode.jl @@ -34,11 +34,11 @@ function av_timecode_make_mpeg_tc_string(buf,tc25bit::Integer) end function av_timecode_init(tc,rate::AVRational,flags::Integer,frame_start::Integer,log_ctx) - ccall((:av_timecode_init,libavutil),Cint,(Ptr{AVTimecode},AVRational,Cint,Cint,Ptr{Void}),tc,rate,flags,frame_start,log_ctx) + ccall((:av_timecode_init,libavutil),Cint,(Ptr{AVTimecode},AVRational,Cint,Cint,Ptr{Cvoid}),tc,rate,flags,frame_start,log_ctx) end function av_timecode_init_from_string(tc,rate::AVRational,str,log_ctx) - ccall((:av_timecode_init_from_string,libavutil),Cint,(Ptr{AVTimecode},AVRational,Cstring,Ptr{Void}),tc,rate,str,log_ctx) + ccall((:av_timecode_init_from_string,libavutil),Cint,(Ptr{AVTimecode},AVRational,Cstring,Ptr{Cvoid}),tc,rate,str,log_ctx) end function av_timecode_check_frame_rate(rate::AVRational) diff --git a/src/ffmpeg/AVUtil/v55/tree.jl b/src/ffmpeg/AVUtil/v55/tree.jl index 4a84526c..ece0dbdc 100644 --- a/src/ffmpeg/AVUtil/v55/tree.jl +++ b/src/ffmpeg/AVUtil/v55/tree.jl @@ -14,18 +14,18 @@ function av_tree_node_alloc() ccall((:av_tree_node_alloc,libavutil),Ptr{AVTreeNode},()) end -function av_tree_find(root,key,cmp,next::NTuple{2,Ptr{Void}}) - ccall((:av_tree_find,libavutil),Ptr{Void},(Ptr{AVTreeNode},Ptr{Void},Ptr{Void},NTuple{2,Ptr{Void}}),root,key,cmp,next) +function av_tree_find(root,key,cmp,next::NTuple{2,Ptr{Cvoid}}) + ccall((:av_tree_find,libavutil),Ptr{Cvoid},(Ptr{AVTreeNode},Ptr{Cvoid},Ptr{Cvoid},NTuple{2,Ptr{Cvoid}}),root,key,cmp,next) end function av_tree_insert(rootp,key,cmp,next) - ccall((:av_tree_insert,libavutil),Ptr{Void},(Ptr{Ptr{AVTreeNode}},Ptr{Void},Ptr{Void},Ptr{Ptr{AVTreeNode}}),rootp,key,cmp,next) + ccall((:av_tree_insert,libavutil),Ptr{Cvoid},(Ptr{Ptr{AVTreeNode}},Ptr{Cvoid},Ptr{Cvoid},Ptr{Ptr{AVTreeNode}}),rootp,key,cmp,next) end function av_tree_destroy(t) - ccall((:av_tree_destroy,libavutil),Void,(Ptr{AVTreeNode},),t) + ccall((:av_tree_destroy,libavutil),Cvoid,(Ptr{AVTreeNode},),t) end function av_tree_enumerate(t,opaque,cmp,enu) - ccall((:av_tree_enumerate,libavutil),Void,(Ptr{AVTreeNode},Ptr{Void},Ptr{Void},Ptr{Void}),t,opaque,cmp,enu) + ccall((:av_tree_enumerate,libavutil),Cvoid,(Ptr{AVTreeNode},Ptr{Cvoid},Ptr{Cvoid},Ptr{Cvoid}),t,opaque,cmp,enu) end diff --git a/src/ffmpeg/AVUtil/v55/twofish.jl b/src/ffmpeg/AVUtil/v55/twofish.jl index b38c15b4..aa09c1ac 100644 --- a/src/ffmpeg/AVUtil/v55/twofish.jl +++ b/src/ffmpeg/AVUtil/v55/twofish.jl @@ -17,5 +17,5 @@ function av_twofish_init(ctx,key,key_bits::Integer) end function av_twofish_crypt(ctx,dst,src,count::Integer,iv,decrypt::Integer) - ccall((:av_twofish_crypt,libavutil),Void,(Ptr{AVTWOFISH},Ptr{UInt8},Ptr{UInt8},Cint,Ptr{UInt8},Cint),ctx,dst,src,count,iv,decrypt) + ccall((:av_twofish_crypt,libavutil),Cvoid,(Ptr{AVTWOFISH},Ptr{UInt8},Ptr{UInt8},Cint,Ptr{UInt8},Cint),ctx,dst,src,count,iv,decrypt) end diff --git a/src/ffmpeg/AVUtil/v55/xtea.jl b/src/ffmpeg/AVUtil/v55/xtea.jl index 4b52d3ab..1573bbf6 100644 --- a/src/ffmpeg/AVUtil/v55/xtea.jl +++ b/src/ffmpeg/AVUtil/v55/xtea.jl @@ -15,17 +15,17 @@ function av_xtea_alloc() end function av_xtea_init(ctx,key::NTuple{16,UInt8}) - ccall((:av_xtea_init,libavutil),Void,(Ptr{AVXTEA},NTuple{16,UInt8}),ctx,key) + ccall((:av_xtea_init,libavutil),Cvoid,(Ptr{AVXTEA},NTuple{16,UInt8}),ctx,key) end function av_xtea_le_init(ctx,key::NTuple{16,UInt8}) - ccall((:av_xtea_le_init,libavutil),Void,(Ptr{AVXTEA},NTuple{16,UInt8}),ctx,key) + ccall((:av_xtea_le_init,libavutil),Cvoid,(Ptr{AVXTEA},NTuple{16,UInt8}),ctx,key) end function av_xtea_crypt(ctx,dst,src,count::Integer,iv,decrypt::Integer) - ccall((:av_xtea_crypt,libavutil),Void,(Ptr{AVXTEA},Ptr{UInt8},Ptr{UInt8},Cint,Ptr{UInt8},Cint),ctx,dst,src,count,iv,decrypt) + ccall((:av_xtea_crypt,libavutil),Cvoid,(Ptr{AVXTEA},Ptr{UInt8},Ptr{UInt8},Cint,Ptr{UInt8},Cint),ctx,dst,src,count,iv,decrypt) end function av_xtea_le_crypt(ctx,dst,src,count::Integer,iv,decrypt::Integer) - ccall((:av_xtea_le_crypt,libavutil),Void,(Ptr{AVXTEA},Ptr{UInt8},Ptr{UInt8},Cint,Ptr{UInt8},Cint),ctx,dst,src,count,iv,decrypt) + ccall((:av_xtea_le_crypt,libavutil),Cvoid,(Ptr{AVXTEA},Ptr{UInt8},Ptr{UInt8},Cint,Ptr{UInt8},Cint),ctx,dst,src,count,iv,decrypt) end diff --git a/src/ffmpeg/SWResample/v0/libswresample_h.jl b/src/ffmpeg/SWResample/v0/libswresample_h.jl index e1d60931..5020760d 100644 --- a/src/ffmpeg/SWResample/v0/libswresample_h.jl +++ b/src/ffmpeg/SWResample/v0/libswresample_h.jl @@ -61,4 +61,4 @@ const SWR_FILTER_TYPE_BLACKMAN_NUTTALL = UInt32(1) const SWR_FILTER_TYPE_KAISER = UInt32(2) # end enum SwrFilterType -const SwrContext = Void +const SwrContext = Nothing diff --git a/src/ffmpeg/SWResample/v0/swresample.jl b/src/ffmpeg/SWResample/v0/swresample.jl index 090d0570..f3f1a3ae 100644 --- a/src/ffmpeg/SWResample/v0/swresample.jl +++ b/src/ffmpeg/SWResample/v0/swresample.jl @@ -40,15 +40,15 @@ function swr_is_initialized(s) end function swr_alloc_set_opts(s,out_ch_layout::Int64,out_sample_fmt::AVSampleFormat,out_sample_rate::Integer,in_ch_layout::Int64,in_sample_fmt::AVSampleFormat,in_sample_rate::Integer,log_offset::Integer,log_ctx) - ccall((:swr_alloc_set_opts,libswresample),Ptr{SwrContext},(Ptr{SwrContext},Int64,AVSampleFormat,Cint,Int64,AVSampleFormat,Cint,Cint,Ptr{Void}),s,out_ch_layout,out_sample_fmt,out_sample_rate,in_ch_layout,in_sample_fmt,in_sample_rate,log_offset,log_ctx) + ccall((:swr_alloc_set_opts,libswresample),Ptr{SwrContext},(Ptr{SwrContext},Int64,AVSampleFormat,Cint,Int64,AVSampleFormat,Cint,Cint,Ptr{Cvoid}),s,out_ch_layout,out_sample_fmt,out_sample_rate,in_ch_layout,in_sample_fmt,in_sample_rate,log_offset,log_ctx) end function swr_free(s) - ccall((:swr_free,libswresample),Void,(Ptr{Ptr{SwrContext}},),s) + ccall((:swr_free,libswresample),Cvoid,(Ptr{Ptr{SwrContext}},),s) end function swr_close(s) - ccall((:swr_close,libswresample),Void,(Ptr{SwrContext},),s) + ccall((:swr_close,libswresample),Cvoid,(Ptr{SwrContext},),s) end function swr_convert(s,out,out_count::Integer,_in,in_count::Integer) diff --git a/src/ffmpeg/SWScale/v2/libswscale_h.jl b/src/ffmpeg/SWScale/v2/libswscale_h.jl index f4e1b543..7978ab4d 100644 --- a/src/ffmpeg/SWScale/v2/libswscale_h.jl +++ b/src/ffmpeg/SWScale/v2/libswscale_h.jl @@ -90,4 +90,4 @@ struct SwsFilter chrV::Ptr{SwsVector} end -const SwsContext = Void +const SwsContext = Nothing diff --git a/src/ffmpeg/SWScale/v2/swscale.jl b/src/ffmpeg/SWScale/v2/swscale.jl index 1f014c68..204a33b1 100644 --- a/src/ffmpeg/SWScale/v2/swscale.jl +++ b/src/ffmpeg/SWScale/v2/swscale.jl @@ -75,7 +75,7 @@ function sws_init_context(sws_context,srcFilter,dstFilter) end function sws_freeContext(swsContext) - ccall((:sws_freeContext,libswscale),Void,(Ptr{SwsContext},),swsContext) + ccall((:sws_freeContext,libswscale),Cvoid,(Ptr{SwsContext},),swsContext) end function sws_getContext(srcW::Integer,srcH::Integer,srcFormat::AVPixelFormat,dstW::Integer,dstH::Integer,dstFormat::AVPixelFormat,flags::Integer,srcFilter,dstFilter,param) @@ -111,27 +111,27 @@ function sws_getIdentityVec() end function sws_scaleVec(a,scalar::Cdouble) - ccall((:sws_scaleVec,libswscale),Void,(Ptr{SwsVector},Cdouble),a,scalar) + ccall((:sws_scaleVec,libswscale),Cvoid,(Ptr{SwsVector},Cdouble),a,scalar) end function sws_normalizeVec(a,height::Cdouble) - ccall((:sws_normalizeVec,libswscale),Void,(Ptr{SwsVector},Cdouble),a,height) + ccall((:sws_normalizeVec,libswscale),Cvoid,(Ptr{SwsVector},Cdouble),a,height) end function sws_convVec(a,b) - ccall((:sws_convVec,libswscale),Void,(Ptr{SwsVector},Ptr{SwsVector}),a,b) + ccall((:sws_convVec,libswscale),Cvoid,(Ptr{SwsVector},Ptr{SwsVector}),a,b) end function sws_addVec(a,b) - ccall((:sws_addVec,libswscale),Void,(Ptr{SwsVector},Ptr{SwsVector}),a,b) + ccall((:sws_addVec,libswscale),Cvoid,(Ptr{SwsVector},Ptr{SwsVector}),a,b) end function sws_subVec(a,b) - ccall((:sws_subVec,libswscale),Void,(Ptr{SwsVector},Ptr{SwsVector}),a,b) + ccall((:sws_subVec,libswscale),Cvoid,(Ptr{SwsVector},Ptr{SwsVector}),a,b) end function sws_shiftVec(a,shift::Integer) - ccall((:sws_shiftVec,libswscale),Void,(Ptr{SwsVector},Cint),a,shift) + ccall((:sws_shiftVec,libswscale),Cvoid,(Ptr{SwsVector},Cint),a,shift) end function sws_cloneVec(a) @@ -139,11 +139,11 @@ function sws_cloneVec(a) end function sws_printVec2(a,log_ctx,log_level::Integer) - ccall((:sws_printVec2,libswscale),Void,(Ptr{SwsVector},Ptr{AVClass},Cint),a,log_ctx,log_level) + ccall((:sws_printVec2,libswscale),Cvoid,(Ptr{SwsVector},Ptr{AVClass},Cint),a,log_ctx,log_level) end function sws_freeVec(a) - ccall((:sws_freeVec,libswscale),Void,(Ptr{SwsVector},),a) + ccall((:sws_freeVec,libswscale),Cvoid,(Ptr{SwsVector},),a) end function sws_getDefaultFilter(lumaGBlur::Cfloat,chromaGBlur::Cfloat,lumaSharpen::Cfloat,chromaSharpen::Cfloat,chromaHShift::Cfloat,chromaVShift::Cfloat,verbose::Integer) @@ -151,7 +151,7 @@ function sws_getDefaultFilter(lumaGBlur::Cfloat,chromaGBlur::Cfloat,lumaSharpen: end function sws_freeFilter(filter) - ccall((:sws_freeFilter,libswscale),Void,(Ptr{SwsFilter},),filter) + ccall((:sws_freeFilter,libswscale),Cvoid,(Ptr{SwsFilter},),filter) end function sws_getCachedContext(context,srcW::Integer,srcH::Integer,srcFormat::AVPixelFormat,dstW::Integer,dstH::Integer,dstFormat::AVPixelFormat,flags::Integer,srcFilter,dstFilter,param) @@ -159,11 +159,11 @@ function sws_getCachedContext(context,srcW::Integer,srcH::Integer,srcFormat::AVP end function sws_convertPalette8ToPacked32(src,dst,num_pixels::Integer,palette) - ccall((:sws_convertPalette8ToPacked32,libswscale),Void,(Ptr{UInt8},Ptr{UInt8},Cint,Ptr{UInt8}),src,dst,num_pixels,palette) + ccall((:sws_convertPalette8ToPacked32,libswscale),Cvoid,(Ptr{UInt8},Ptr{UInt8},Cint,Ptr{UInt8}),src,dst,num_pixels,palette) end function sws_convertPalette8ToPacked24(src,dst,num_pixels::Integer,palette) - ccall((:sws_convertPalette8ToPacked24,libswscale),Void,(Ptr{UInt8},Ptr{UInt8},Cint,Ptr{UInt8}),src,dst,num_pixels,palette) + ccall((:sws_convertPalette8ToPacked24,libswscale),Cvoid,(Ptr{UInt8},Ptr{UInt8},Cint,Ptr{UInt8}),src,dst,num_pixels,palette) end function sws_get_class() diff --git a/src/ffmpeg/SWScale/v3/libswscale_h.jl b/src/ffmpeg/SWScale/v3/libswscale_h.jl index f4e1b543..7978ab4d 100644 --- a/src/ffmpeg/SWScale/v3/libswscale_h.jl +++ b/src/ffmpeg/SWScale/v3/libswscale_h.jl @@ -90,4 +90,4 @@ struct SwsFilter chrV::Ptr{SwsVector} end -const SwsContext = Void +const SwsContext = Nothing diff --git a/src/ffmpeg/SWScale/v3/swscale.jl b/src/ffmpeg/SWScale/v3/swscale.jl index 2e6ffdab..11a4f908 100644 --- a/src/ffmpeg/SWScale/v3/swscale.jl +++ b/src/ffmpeg/SWScale/v3/swscale.jl @@ -75,7 +75,7 @@ function sws_init_context(sws_context,srcFilter,dstFilter) end function sws_freeContext(swsContext) - ccall((:sws_freeContext,libswscale),Void,(Ptr{SwsContext},),swsContext) + ccall((:sws_freeContext,libswscale),Cvoid,(Ptr{SwsContext},),swsContext) end function sws_getContext(srcW::Integer,srcH::Integer,srcFormat::AVPixelFormat,dstW::Integer,dstH::Integer,dstFormat::AVPixelFormat,flags::Integer,srcFilter,dstFilter,param) @@ -111,27 +111,27 @@ function sws_getIdentityVec() end function sws_scaleVec(a,scalar::Cdouble) - ccall((:sws_scaleVec,libswscale),Void,(Ptr{SwsVector},Cdouble),a,scalar) + ccall((:sws_scaleVec,libswscale),Cvoid,(Ptr{SwsVector},Cdouble),a,scalar) end function sws_normalizeVec(a,height::Cdouble) - ccall((:sws_normalizeVec,libswscale),Void,(Ptr{SwsVector},Cdouble),a,height) + ccall((:sws_normalizeVec,libswscale),Cvoid,(Ptr{SwsVector},Cdouble),a,height) end function sws_convVec(a,b) - ccall((:sws_convVec,libswscale),Void,(Ptr{SwsVector},Ptr{SwsVector}),a,b) + ccall((:sws_convVec,libswscale),Cvoid,(Ptr{SwsVector},Ptr{SwsVector}),a,b) end function sws_addVec(a,b) - ccall((:sws_addVec,libswscale),Void,(Ptr{SwsVector},Ptr{SwsVector}),a,b) + ccall((:sws_addVec,libswscale),Cvoid,(Ptr{SwsVector},Ptr{SwsVector}),a,b) end function sws_subVec(a,b) - ccall((:sws_subVec,libswscale),Void,(Ptr{SwsVector},Ptr{SwsVector}),a,b) + ccall((:sws_subVec,libswscale),Cvoid,(Ptr{SwsVector},Ptr{SwsVector}),a,b) end function sws_shiftVec(a,shift::Integer) - ccall((:sws_shiftVec,libswscale),Void,(Ptr{SwsVector},Cint),a,shift) + ccall((:sws_shiftVec,libswscale),Cvoid,(Ptr{SwsVector},Cint),a,shift) end function sws_cloneVec(a) @@ -139,11 +139,11 @@ function sws_cloneVec(a) end function sws_printVec2(a,log_ctx,log_level::Integer) - ccall((:sws_printVec2,libswscale),Void,(Ptr{SwsVector},Ptr{AVClass},Cint),a,log_ctx,log_level) + ccall((:sws_printVec2,libswscale),Cvoid,(Ptr{SwsVector},Ptr{AVClass},Cint),a,log_ctx,log_level) end function sws_freeVec(a) - ccall((:sws_freeVec,libswscale),Void,(Ptr{SwsVector},),a) + ccall((:sws_freeVec,libswscale),Cvoid,(Ptr{SwsVector},),a) end function sws_getDefaultFilter(lumaGBlur::Cfloat,chromaGBlur::Cfloat,lumaSharpen::Cfloat,chromaSharpen::Cfloat,chromaHShift::Cfloat,chromaVShift::Cfloat,verbose::Integer) @@ -151,7 +151,7 @@ function sws_getDefaultFilter(lumaGBlur::Cfloat,chromaGBlur::Cfloat,lumaSharpen: end function sws_freeFilter(filter) - ccall((:sws_freeFilter,libswscale),Void,(Ptr{SwsFilter},),filter) + ccall((:sws_freeFilter,libswscale),Cvoid,(Ptr{SwsFilter},),filter) end function sws_getCachedContext(context,srcW::Integer,srcH::Integer,srcFormat::AVPixelFormat,dstW::Integer,dstH::Integer,dstFormat::AVPixelFormat,flags::Integer,srcFilter,dstFilter,param) @@ -159,11 +159,11 @@ function sws_getCachedContext(context,srcW::Integer,srcH::Integer,srcFormat::AVP end function sws_convertPalette8ToPacked32(src,dst,num_pixels::Integer,palette) - ccall((:sws_convertPalette8ToPacked32,libswscale),Void,(Ptr{UInt8},Ptr{UInt8},Cint,Ptr{UInt8}),src,dst,num_pixels,palette) + ccall((:sws_convertPalette8ToPacked32,libswscale),Cvoid,(Ptr{UInt8},Ptr{UInt8},Cint,Ptr{UInt8}),src,dst,num_pixels,palette) end function sws_convertPalette8ToPacked24(src,dst,num_pixels::Integer,palette) - ccall((:sws_convertPalette8ToPacked24,libswscale),Void,(Ptr{UInt8},Ptr{UInt8},Cint,Ptr{UInt8}),src,dst,num_pixels,palette) + ccall((:sws_convertPalette8ToPacked24,libswscale),Cvoid,(Ptr{UInt8},Ptr{UInt8},Cint,Ptr{UInt8}),src,dst,num_pixels,palette) end function sws_get_class() diff --git a/src/ffmpeg/SWScale/v4/libswscale_h.jl b/src/ffmpeg/SWScale/v4/libswscale_h.jl index 92d41186..693748cb 100644 --- a/src/ffmpeg/SWScale/v4/libswscale_h.jl +++ b/src/ffmpeg/SWScale/v4/libswscale_h.jl @@ -94,4 +94,4 @@ struct SwsFilter chrV::Ptr{SwsVector} end -const SwsContext = Void +const SwsContext = Nothing diff --git a/src/ffmpeg/SWScale/v4/swscale.jl b/src/ffmpeg/SWScale/v4/swscale.jl index 1666c4bf..63f88003 100644 --- a/src/ffmpeg/SWScale/v4/swscale.jl +++ b/src/ffmpeg/SWScale/v4/swscale.jl @@ -75,7 +75,7 @@ function sws_init_context(sws_context,srcFilter,dstFilter) end function sws_freeContext(swsContext) - ccall((:sws_freeContext,libswscale),Void,(Ptr{SwsContext},),swsContext) + ccall((:sws_freeContext,libswscale),Cvoid,(Ptr{SwsContext},),swsContext) end function sws_getContext(srcW::Integer,srcH::Integer,srcFormat::AVPixelFormat,dstW::Integer,dstH::Integer,dstFormat::AVPixelFormat,flags::Integer,srcFilter,dstFilter,param) @@ -111,27 +111,27 @@ function sws_getIdentityVec() end function sws_scaleVec(a,scalar::Cdouble) - ccall((:sws_scaleVec,libswscale),Void,(Ptr{SwsVector},Cdouble),a,scalar) + ccall((:sws_scaleVec,libswscale),Cvoid,(Ptr{SwsVector},Cdouble),a,scalar) end function sws_normalizeVec(a,height::Cdouble) - ccall((:sws_normalizeVec,libswscale),Void,(Ptr{SwsVector},Cdouble),a,height) + ccall((:sws_normalizeVec,libswscale),Cvoid,(Ptr{SwsVector},Cdouble),a,height) end function sws_convVec(a,b) - ccall((:sws_convVec,libswscale),Void,(Ptr{SwsVector},Ptr{SwsVector}),a,b) + ccall((:sws_convVec,libswscale),Cvoid,(Ptr{SwsVector},Ptr{SwsVector}),a,b) end function sws_addVec(a,b) - ccall((:sws_addVec,libswscale),Void,(Ptr{SwsVector},Ptr{SwsVector}),a,b) + ccall((:sws_addVec,libswscale),Cvoid,(Ptr{SwsVector},Ptr{SwsVector}),a,b) end function sws_subVec(a,b) - ccall((:sws_subVec,libswscale),Void,(Ptr{SwsVector},Ptr{SwsVector}),a,b) + ccall((:sws_subVec,libswscale),Cvoid,(Ptr{SwsVector},Ptr{SwsVector}),a,b) end function sws_shiftVec(a,shift::Integer) - ccall((:sws_shiftVec,libswscale),Void,(Ptr{SwsVector},Cint),a,shift) + ccall((:sws_shiftVec,libswscale),Cvoid,(Ptr{SwsVector},Cint),a,shift) end function sws_cloneVec(a) @@ -139,11 +139,11 @@ function sws_cloneVec(a) end function sws_printVec2(a,log_ctx,log_level::Integer) - ccall((:sws_printVec2,libswscale),Void,(Ptr{SwsVector},Ptr{AVClass},Cint),a,log_ctx,log_level) + ccall((:sws_printVec2,libswscale),Cvoid,(Ptr{SwsVector},Ptr{AVClass},Cint),a,log_ctx,log_level) end function sws_freeVec(a) - ccall((:sws_freeVec,libswscale),Void,(Ptr{SwsVector},),a) + ccall((:sws_freeVec,libswscale),Cvoid,(Ptr{SwsVector},),a) end function sws_getDefaultFilter(lumaGBlur::Cfloat,chromaGBlur::Cfloat,lumaSharpen::Cfloat,chromaSharpen::Cfloat,chromaHShift::Cfloat,chromaVShift::Cfloat,verbose::Integer) @@ -151,7 +151,7 @@ function sws_getDefaultFilter(lumaGBlur::Cfloat,chromaGBlur::Cfloat,lumaSharpen: end function sws_freeFilter(filter) - ccall((:sws_freeFilter,libswscale),Void,(Ptr{SwsFilter},),filter) + ccall((:sws_freeFilter,libswscale),Cvoid,(Ptr{SwsFilter},),filter) end function sws_getCachedContext(context,srcW::Integer,srcH::Integer,srcFormat::AVPixelFormat,dstW::Integer,dstH::Integer,dstFormat::AVPixelFormat,flags::Integer,srcFilter,dstFilter,param) @@ -159,11 +159,11 @@ function sws_getCachedContext(context,srcW::Integer,srcH::Integer,srcFormat::AVP end function sws_convertPalette8ToPacked32(src,dst,num_pixels::Integer,palette) - ccall((:sws_convertPalette8ToPacked32,libswscale),Void,(Ptr{UInt8},Ptr{UInt8},Cint,Ptr{UInt8}),src,dst,num_pixels,palette) + ccall((:sws_convertPalette8ToPacked32,libswscale),Cvoid,(Ptr{UInt8},Ptr{UInt8},Cint,Ptr{UInt8}),src,dst,num_pixels,palette) end function sws_convertPalette8ToPacked24(src,dst,num_pixels::Integer,palette) - ccall((:sws_convertPalette8ToPacked24,libswscale),Void,(Ptr{UInt8},Ptr{UInt8},Cint,Ptr{UInt8}),src,dst,num_pixels,palette) + ccall((:sws_convertPalette8ToPacked24,libswscale),Cvoid,(Ptr{UInt8},Ptr{UInt8},Cint,Ptr{UInt8}),src,dst,num_pixels,palette) end function sws_get_class() diff --git a/src/init.jl b/src/init.jl index f2c0b488..3fad8e7f 100644 --- a/src/init.jl +++ b/src/init.jl @@ -16,7 +16,7 @@ if !isdefined(:ffmpeg_or_libav) end av_load_path = joinpath(dirname(@__FILE__), ffmpeg_or_libav) -!(av_load_path in LOAD_PATH) && unshift!(LOAD_PATH, av_load_path) +!(av_load_path in LOAD_PATH) && pushfirst!(LOAD_PATH, av_load_path) diff --git a/src/libav/AVCodecs/v53/avcodec.jl b/src/libav/AVCodecs/v53/avcodec.jl index 0cf8ced0..e5289f19 100644 --- a/src/libav/AVCodecs/v53/avcodec.jl +++ b/src/libav/AVCodecs/v53/avcodec.jl @@ -111,15 +111,15 @@ export function av_destruct_packet_nofree(pkt) - ccall((:av_destruct_packet_nofree,libavcodec),Void,(Ptr{AVPacket},),pkt) + ccall((:av_destruct_packet_nofree,libavcodec),Cvoid,(Ptr{AVPacket},),pkt) end function av_destruct_packet(pkt) - ccall((:av_destruct_packet,libavcodec),Void,(Ptr{AVPacket},),pkt) + ccall((:av_destruct_packet,libavcodec),Cvoid,(Ptr{AVPacket},),pkt) end function av_init_packet(pkt) - ccall((:av_init_packet,libavcodec),Void,(Ptr{AVPacket},),pkt) + ccall((:av_init_packet,libavcodec),Cvoid,(Ptr{AVPacket},),pkt) end function av_new_packet(pkt,size::Integer) @@ -127,7 +127,7 @@ function av_new_packet(pkt,size::Integer) end function av_shrink_packet(pkt,size::Integer) - ccall((:av_shrink_packet,libavcodec),Void,(Ptr{AVPacket},Cint),pkt,size) + ccall((:av_shrink_packet,libavcodec),Cvoid,(Ptr{AVPacket},Cint),pkt,size) end function av_grow_packet(pkt,grow_by::Integer) @@ -139,7 +139,7 @@ function av_dup_packet(pkt) end function av_free_packet(pkt) - ccall((:av_free_packet,libavcodec),Void,(Ptr{AVPacket},),pkt) + ccall((:av_free_packet,libavcodec),Cvoid,(Ptr{AVPacket},),pkt) end function av_packet_new_side_data(pkt,_type::AVPacketSideDataType,size::Integer) @@ -159,7 +159,7 @@ function audio_resample(s,output,input,nb_samples::Integer) end function audio_resample_close(s) - ccall((:audio_resample_close,libavcodec),Void,(Ptr{ReSampleContext},),s) + ccall((:audio_resample_close,libavcodec),Cvoid,(Ptr{ReSampleContext},),s) end function av_resample_init(out_rate::Integer,in_rate::Integer,filter_length::Integer,log2_phase_count::Integer,linear::Integer,cutoff::Cdouble) @@ -171,11 +171,11 @@ function av_resample(c,dst,src,consumed,src_size::Integer,dst_size::Integer,upda end function av_resample_compensate(c,sample_delta::Integer,compensation_distance::Integer) - ccall((:av_resample_compensate,libavcodec),Void,(Ptr{AVResampleContext},Cint,Cint),c,sample_delta,compensation_distance) + ccall((:av_resample_compensate,libavcodec),Cvoid,(Ptr{AVResampleContext},Cint,Cint),c,sample_delta,compensation_distance) end function av_resample_close(c) - ccall((:av_resample_close,libavcodec),Void,(Ptr{AVResampleContext},),c) + ccall((:av_resample_close,libavcodec),Cvoid,(Ptr{AVResampleContext},),c) end function avpicture_alloc(picture,pix_fmt::PixelFormat,width::Integer,height::Integer) @@ -183,7 +183,7 @@ function avpicture_alloc(picture,pix_fmt::PixelFormat,width::Integer,height::Int end function avpicture_free(picture) - ccall((:avpicture_free,libavcodec),Void,(Ptr{AVPicture},),picture) + ccall((:avpicture_free,libavcodec),Cvoid,(Ptr{AVPicture},),picture) end function avpicture_fill(picture,ptr,pix_fmt::PixelFormat,width::Integer,height::Integer) @@ -199,7 +199,7 @@ function avpicture_get_size(pix_fmt::PixelFormat,width::Integer,height::Integer) end function avcodec_get_chroma_sub_sample(pix_fmt::PixelFormat,h_shift,v_shift) - ccall((:avcodec_get_chroma_sub_sample,libavcodec),Void,(PixelFormat,Ptr{Cint},Ptr{Cint}),pix_fmt,h_shift,v_shift) + ccall((:avcodec_get_chroma_sub_sample,libavcodec),Cvoid,(PixelFormat,Ptr{Cint},Ptr{Cint}),pix_fmt,h_shift,v_shift) end function avcodec_get_pix_fmt_name(pix_fmt::PixelFormat) @@ -207,7 +207,7 @@ function avcodec_get_pix_fmt_name(pix_fmt::PixelFormat) end function avcodec_set_dimensions(s,width::Integer,height::Integer) - ccall((:avcodec_set_dimensions,libavcodec),Void,(Ptr{AVCodecContext},Cint,Cint),s,width,height) + ccall((:avcodec_set_dimensions,libavcodec),Cvoid,(Ptr{AVCodecContext},Cint,Cint),s,width,height) end function avcodec_pix_fmt_to_codec_tag(pix_fmt::PixelFormat) @@ -251,11 +251,11 @@ function avcodec_license() end function avcodec_init() - ccall((:avcodec_init,libavcodec),Void,()) + ccall((:avcodec_init,libavcodec),Cvoid,()) end function avcodec_register(codec) - ccall((:avcodec_register,libavcodec),Void,(Ptr{AVCodec},),codec) + ccall((:avcodec_register,libavcodec),Cvoid,(Ptr{AVCodec},),codec) end function avcodec_find_encoder(id::CodecID) @@ -275,7 +275,7 @@ function avcodec_find_decoder_by_name(name) end function avcodec_string(buf,buf_size::Integer,enc,encode::Integer) - ccall((:avcodec_string,libavcodec),Void,(Ptr{UInt8},Cint,Ptr{AVCodecContext},Cint),buf,buf_size,enc,encode) + ccall((:avcodec_string,libavcodec),Cvoid,(Ptr{UInt8},Cint,Ptr{AVCodecContext},Cint),buf,buf_size,enc,encode) end function av_get_profile_name(codec,profile::Integer) @@ -283,11 +283,11 @@ function av_get_profile_name(codec,profile::Integer) end function avcodec_get_context_defaults(s) - ccall((:avcodec_get_context_defaults,libavcodec),Void,(Ptr{AVCodecContext},),s) + ccall((:avcodec_get_context_defaults,libavcodec),Cvoid,(Ptr{AVCodecContext},),s) end function avcodec_get_context_defaults2(s,arg1::AVMediaType) - ccall((:avcodec_get_context_defaults2,libavcodec),Void,(Ptr{AVCodecContext},AVMediaType),s,arg1) + ccall((:avcodec_get_context_defaults2,libavcodec),Cvoid,(Ptr{AVCodecContext},AVMediaType),s,arg1) end function avcodec_get_context_defaults3(s,codec) @@ -311,7 +311,7 @@ function avcodec_copy_context(dest,src) end function avcodec_get_frame_defaults(pic) - ccall((:avcodec_get_frame_defaults,libavcodec),Void,(Ptr{AVFrame},),pic) + ccall((:avcodec_get_frame_defaults,libavcodec),Cvoid,(Ptr{AVFrame},),pic) end function avcodec_alloc_frame() @@ -323,7 +323,7 @@ function avcodec_default_get_buffer(s,pic) end function avcodec_default_release_buffer(s,pic) - ccall((:avcodec_default_release_buffer,libavcodec),Void,(Ptr{AVCodecContext},Ptr{AVFrame}),s,pic) + ccall((:avcodec_default_release_buffer,libavcodec),Cvoid,(Ptr{AVCodecContext},Ptr{AVFrame}),s,pic) end function avcodec_default_reget_buffer(s,pic) @@ -335,11 +335,11 @@ function avcodec_get_edge_width() end function avcodec_align_dimensions(s,width,height) - ccall((:avcodec_align_dimensions,libavcodec),Void,(Ptr{AVCodecContext},Ptr{Cint},Ptr{Cint}),s,width,height) + ccall((:avcodec_align_dimensions,libavcodec),Cvoid,(Ptr{AVCodecContext},Ptr{Cint},Ptr{Cint}),s,width,height) end function avcodec_align_dimensions2(s,width,height,linesize_align) - ccall((:avcodec_align_dimensions2,libavcodec),Void,(Ptr{AVCodecContext},Ptr{Cint},Ptr{Cint},Ptr{Cint}),s,width,height,linesize_align) + ccall((:avcodec_align_dimensions2,libavcodec),Cvoid,(Ptr{AVCodecContext},Ptr{Cint},Ptr{Cint},Ptr{Cint}),s,width,height,linesize_align) end function avcodec_default_get_format(s,fmt) @@ -351,11 +351,11 @@ function avcodec_thread_init(s,thread_count::Integer) end function avcodec_default_execute(c,func,arg,ret,count::Integer,size::Integer) - ccall((:avcodec_default_execute,libavcodec),Cint,(Ptr{AVCodecContext},Ptr{Void},Ptr{Void},Ptr{Cint},Cint,Cint),c,func,arg,ret,count,size) + ccall((:avcodec_default_execute,libavcodec),Cint,(Ptr{AVCodecContext},Ptr{Cvoid},Ptr{Cvoid},Ptr{Cint},Cint,Cint),c,func,arg,ret,count,size) end function avcodec_default_execute2(c,func,arg,ret,count::Integer) - ccall((:avcodec_default_execute2,libavcodec),Cint,(Ptr{AVCodecContext},Ptr{Void},Ptr{Void},Ptr{Cint},Cint),c,func,arg,ret,count) + ccall((:avcodec_default_execute2,libavcodec),Cint,(Ptr{AVCodecContext},Ptr{Cvoid},Ptr{Cvoid},Ptr{Cint},Cint),c,func,arg,ret,count) end function avcodec_open(avctx,codec) @@ -383,7 +383,7 @@ function avcodec_decode_subtitle2(avctx,sub,got_sub_ptr,avpkt) end function avsubtitle_free(sub) - ccall((:avsubtitle_free,libavcodec),Void,(Ptr{AVSubtitle},),sub) + ccall((:avsubtitle_free,libavcodec),Cvoid,(Ptr{AVSubtitle},),sub) end function avcodec_encode_audio(avctx,buf,buf_size::Integer,samples) @@ -411,15 +411,15 @@ function avcodec_close(avctx) end function avcodec_register_all() - ccall((:avcodec_register_all,libavcodec),Void,()) + ccall((:avcodec_register_all,libavcodec),Cvoid,()) end function avcodec_flush_buffers(avctx) - ccall((:avcodec_flush_buffers,libavcodec),Void,(Ptr{AVCodecContext},),avctx) + ccall((:avcodec_flush_buffers,libavcodec),Cvoid,(Ptr{AVCodecContext},),avctx) end function avcodec_default_free_buffers(s) - ccall((:avcodec_default_free_buffers,libavcodec),Void,(Ptr{AVCodecContext},),s) + ccall((:avcodec_default_free_buffers,libavcodec),Cvoid,(Ptr{AVCodecContext},),s) end function av_get_pict_type_char(pict_type::Integer) @@ -439,7 +439,7 @@ function av_parser_next(c) end function av_register_codec_parser(parser) - ccall((:av_register_codec_parser,libavcodec),Void,(Ptr{AVCodecParser},),parser) + ccall((:av_register_codec_parser,libavcodec),Cvoid,(Ptr{AVCodecParser},),parser) end function av_parser_init(codec_id::Integer) @@ -455,11 +455,11 @@ function av_parser_change(s,avctx,poutbuf,poutbuf_size,buf,buf_size::Integer,key end function av_parser_close(s) - ccall((:av_parser_close,libavcodec),Void,(Ptr{AVCodecParserContext},),s) + ccall((:av_parser_close,libavcodec),Cvoid,(Ptr{AVCodecParserContext},),s) end function av_register_bitstream_filter(bsf) - ccall((:av_register_bitstream_filter,libavcodec),Void,(Ptr{AVBitStreamFilter},),bsf) + ccall((:av_register_bitstream_filter,libavcodec),Cvoid,(Ptr{AVBitStreamFilter},),bsf) end function av_bitstream_filter_init(name) @@ -471,7 +471,7 @@ function av_bitstream_filter_filter(bsfc,avctx,args,poutbuf,poutbuf_size,buf,buf end function av_bitstream_filter_close(bsf) - ccall((:av_bitstream_filter_close,libavcodec),Void,(Ptr{AVBitStreamFilterContext},),bsf) + ccall((:av_bitstream_filter_close,libavcodec),Cvoid,(Ptr{AVBitStreamFilterContext},),bsf) end function av_bitstream_filter_next(f) @@ -479,15 +479,15 @@ function av_bitstream_filter_next(f) end function av_fast_realloc(ptr,size,min_size::Csize_t) - ccall((:av_fast_realloc,libavcodec),Ptr{Void},(Ptr{Void},Ptr{UInt32},Csize_t),ptr,size,min_size) + ccall((:av_fast_realloc,libavcodec),Ptr{Cvoid},(Ptr{Cvoid},Ptr{UInt32},Csize_t),ptr,size,min_size) end function av_fast_malloc(ptr,size,min_size::Csize_t) - ccall((:av_fast_malloc,libavcodec),Void,(Ptr{Void},Ptr{UInt32},Csize_t),ptr,size,min_size) + ccall((:av_fast_malloc,libavcodec),Cvoid,(Ptr{Cvoid},Ptr{UInt32},Csize_t),ptr,size,min_size) end function av_picture_copy(dst,src,pix_fmt::PixelFormat,width::Integer,height::Integer) - ccall((:av_picture_copy,libavcodec),Void,(Ptr{AVPicture},Ptr{AVPicture},PixelFormat,Cint,Cint),dst,src,pix_fmt,width,height) + ccall((:av_picture_copy,libavcodec),Cvoid,(Ptr{AVPicture},Ptr{AVPicture},PixelFormat,Cint,Cint),dst,src,pix_fmt,width,height) end function av_picture_crop(dst,src,pix_fmt::PixelFormat,top_band::Integer,left_band::Integer) @@ -503,11 +503,11 @@ function av_xiphlacing(s,v::Integer) end function av_log_missing_feature(avc,feature,want_sample::Integer) - ccall((:av_log_missing_feature,libavcodec),Void,(Ptr{Void},Ptr{UInt8},Cint),avc,feature,want_sample) + ccall((:av_log_missing_feature,libavcodec),Cvoid,(Ptr{Cvoid},Ptr{UInt8},Cint),avc,feature,want_sample) end function av_register_hwaccel(hwaccel) - ccall((:av_register_hwaccel,libavcodec),Void,(Ptr{AVHWAccel},),hwaccel) + ccall((:av_register_hwaccel,libavcodec),Cvoid,(Ptr{AVHWAccel},),hwaccel) end function av_hwaccel_next(hwaccel) @@ -515,7 +515,7 @@ function av_hwaccel_next(hwaccel) end function av_lockmgr_register(cb) - ccall((:av_lockmgr_register,libavcodec),Cint,(Ptr{Void},),cb) + ccall((:av_lockmgr_register,libavcodec),Cint,(Ptr{Cvoid},),cb) end function avcodec_get_type(codec_id::CodecID) diff --git a/src/libav/AVCodecs/v53/libavcodec_h.jl b/src/libav/AVCodecs/v53/libavcodec_h.jl index 2ce06390..59b3d022 100644 --- a/src/libav/AVCodecs/v53/libavcodec_h.jl +++ b/src/libav/AVCodecs/v53/libavcodec_h.jl @@ -1420,11 +1420,11 @@ struct AVPacket size::Cint stream_index::Cint flags::Cint - side_data::Ptr{Void} + side_data::Ptr{Cvoid} side_data_elems::Cint duration::Cint - destruct::Ptr{Void} - priv::Ptr{Void} + destruct::Ptr{Cvoid} + priv::Ptr{Cvoid} pos::Int64 convergence_duration::Int64 end @@ -1456,8 +1456,8 @@ end zero(::Type{Array_4_Cint}) = Array_4_Cint(fill(zero(Cint),4)...) struct Array_2_Ptr - d1::Ptr{Void} - d2::Ptr{Void} + d1::Ptr{Cvoid} + d2::Ptr{Cvoid} end zero(::Type{Array_2_Ptr}) = Array_2_Ptr(fill(C_NULL,2)...) @@ -1476,20 +1476,20 @@ struct AVProfile name::Ptr{UInt8} end -const AVCodecDefault = Void +const AVCodecDefault = Nothing struct AVCodec name::Ptr{UInt8} _type::AVMediaType id::CodecID priv_data_size::Cint - init::Ptr{Void} - encode::Ptr{Void} - close::Ptr{Void} - decode::Ptr{Void} + init::Ptr{Cvoid} + encode::Ptr{Cvoid} + close::Ptr{Cvoid} + decode::Ptr{Cvoid} capabilities::Cint next::Ptr{AVCodec} - flush::Ptr{Void} + flush::Ptr{Cvoid} supported_framerates::Ptr{AVRational} pix_fmts::Ptr{PixelFormat} long_name::Ptr{UInt8} @@ -1499,11 +1499,11 @@ struct AVCodec max_lowres::UInt8 priv_class::Ptr{AVClass} profiles::Ptr{AVProfile} - init_thread_copy::Ptr{Void} - update_thread_context::Ptr{Void} + init_thread_copy::Ptr{Cvoid} + update_thread_context::Ptr{Cvoid} defaults::Ptr{AVCodecDefault} - init_static_data::Ptr{Void} - encode2::Ptr{Void} + init_static_data::Ptr{Cvoid} + encode2::Ptr{Cvoid} end struct Array_32_Uint8 @@ -1816,13 +1816,13 @@ struct AVHWAccel pix_fmt::PixelFormat capabilities::Cint next::Ptr{AVHWAccel} - start_frame::Ptr{Void} - decode_slice::Ptr{Void} - end_frame::Ptr{Void} + start_frame::Ptr{Cvoid} + decode_slice::Ptr{Cvoid} + end_frame::Ptr{Cvoid} priv_data_size::Cint end -const AVCodecInternal = Void +const AVCodecInternal = Nothing # begin enum AVFieldOrder const AVFieldOrder = UInt32 @@ -1848,7 +1848,7 @@ struct AVCodecContext height::Cint gop_size::Cint pix_fmt::PixelFormat - draw_horiz_band::Ptr{Void} + draw_horiz_band::Ptr{Cvoid} sample_rate::Cint channels::Cint sample_fmt::AVSampleFormat @@ -1865,9 +1865,9 @@ struct AVCodecContext rc_strategy::Cint b_frame_strategy::Cint codec::Ptr{AVCodec} - priv_data::Ptr{Void} + priv_data::Ptr{Cvoid} rtp_payload_size::Cint - rtp_callback::Ptr{Void} + rtp_callback::Ptr{Cvoid} mv_bits::Cint header_bits::Cint i_tex_bits::Cint @@ -1877,7 +1877,7 @@ struct AVCodecContext skip_count::Cint misc_bits::Cint frame_bits::Cint - opaque::Ptr{Void} + opaque::Ptr{Cvoid} codec_name::Array_32_Uint8 codec_type::AVMediaType codec_id::CodecID @@ -1888,8 +1888,8 @@ struct AVCodecContext strict_std_compliance::Cint b_quant_offset::Cfloat error_recognition::Cint - get_buffer::Ptr{Void} - release_buffer::Ptr{Void} + get_buffer::Ptr{Cvoid} + release_buffer::Ptr{Cvoid} has_b_frames::Cint block_align::Cint parse_only::Cint @@ -1923,7 +1923,7 @@ struct AVCodecContext bits_per_coded_sample::Cint prediction_method::Cint sample_aspect_ratio::AVRational - coded_frame::Ptr{Void} # Ptr{AVFrame} + coded_frame::Ptr{Cvoid} # Ptr{AVFrame} debug::Cint debug_mv::Cint error::Array_4_Uint64 @@ -1937,14 +1937,14 @@ struct AVCodecContext me_pre_cmp::Cint pre_dia_size::Cint me_subpel_quality::Cint - get_format::Ptr{Void} + get_format::Ptr{Cvoid} dtg_active_format::Cint me_range::Cint intra_quant_bias::Cint inter_quant_bias::Cint color_table_id::Cint internal_buffer_count::Cint - internal_buffer::Ptr{Void} + internal_buffer::Ptr{Cvoid} global_quality::Cint coder_type::Cint context_model::Cint @@ -1959,7 +1959,7 @@ struct AVCodecContext lmax::Cint palctrl::Ptr{AVPaletteControl} noise_reduction::Cint - reget_buffer::Ptr{Void} + reget_buffer::Ptr{Cvoid} rc_initial_buffer_occupancy::Cint inter_threshold::Cint flags2::Cint @@ -1967,8 +1967,8 @@ struct AVCodecContext antialias_algo::Cint quantizer_noise_shaping::Cint thread_count::Cint - execute::Ptr{Void} - thread_opaque::Ptr{Void} + execute::Ptr{Cvoid} + thread_opaque::Ptr{Cvoid} me_threshold::Cint mb_threshold::Cint intra_dc_precision::Cint @@ -2027,13 +2027,13 @@ struct AVCodecContext rc_min_vbv_overflow_use::Cfloat hwaccel::Ptr{AVHWAccel} ticks_per_frame::Cint - hwaccel_context::Ptr{Void} + hwaccel_context::Ptr{Cvoid} color_primaries::AVColorPrimaries color_trc::AVColorTransferCharacteristic colorspace::AVColorSpace color_range::AVColorRange chroma_sample_location::AVChromaLocation - execute2::Ptr{Void} + execute2::Ptr{Cvoid} weighted_p_pred::Cint aq_mode::Cint aq_strength::Cfloat @@ -2078,7 +2078,7 @@ struct AVFrame motion_val::Array_2_Ptr mb_type::Ptr{UInt32} motion_subsample_log2::UInt8 - opaque::Ptr{Void} + opaque::Ptr{Cvoid} error::Array_4_Uint64 _type::Cint repeat_pict::Cint @@ -2091,11 +2091,11 @@ struct AVFrame dct_coeff::Ptr{Int16} ref_index::Array_2_Ptr reordered_opaque::Int64 - hwaccel_picture_private::Ptr{Void} + hwaccel_picture_private::Ptr{Cvoid} pkt_pts::Int64 pkt_dts::Int64 owner::Ptr{AVCodecContext} - thread_opaque::Ptr{Void} + thread_opaque::Ptr{Cvoid} nb_samples::Cint extended_data::Ptr{Ptr{UInt8}} sample_aspect_ratio::AVRational @@ -2138,8 +2138,8 @@ struct AVSubtitle pts::Int64 end -const ReSampleContext = Void -const AVResampleContext = Void +const ReSampleContext = Nothing +const AVResampleContext = Nothing struct Array_4_Int64 d1::Int64 @@ -2163,15 +2163,15 @@ zero(::Type{Array_5_Cint}) = Array_5_Cint(fill(zero(Cint),5)...) struct AVCodecParser codec_ids::Array_5_Cint priv_data_size::Cint - parser_init::Ptr{Void} - parser_parse::Ptr{Void} - parser_close::Ptr{Void} - split::Ptr{Void} + parser_init::Ptr{Cvoid} + parser_parse::Ptr{Cvoid} + parser_close::Ptr{Cvoid} + split::Ptr{Cvoid} next::Ptr{AVCodecParser} end struct AVCodecParserContext - priv_data::Ptr{Void} + priv_data::Ptr{Cvoid} parser::Ptr{AVCodecParser} frame_offset::Int64 cur_offset::Int64 @@ -2203,13 +2203,13 @@ end struct AVBitStreamFilter name::Ptr{UInt8} priv_data_size::Cint - filter::Ptr{Void} - close::Ptr{Void} + filter::Ptr{Cvoid} + close::Ptr{Cvoid} next::Ptr{AVBitStreamFilter} end struct AVBitStreamFilterContext - priv_data::Ptr{Void} + priv_data::Ptr{Cvoid} filter::Ptr{AVBitStreamFilter} parser::Ptr{AVCodecParserContext} next::Ptr{AVBitStreamFilterContext} diff --git a/src/libav/AVCodecs/v54/avcodec.jl b/src/libav/AVCodecs/v54/avcodec.jl index 29a04584..42e30718 100644 --- a/src/libav/AVCodecs/v54/avcodec.jl +++ b/src/libav/AVCodecs/v54/avcodec.jl @@ -127,11 +127,11 @@ function avcodec_license() end function avcodec_register(codec) - ccall((:avcodec_register,libavcodec),Void,(Ptr{AVCodec},),codec) + ccall((:avcodec_register,libavcodec),Cvoid,(Ptr{AVCodec},),codec) end function avcodec_register_all() - ccall((:avcodec_register_all,libavcodec),Void,()) + ccall((:avcodec_register_all,libavcodec),Cvoid,()) end function avcodec_alloc_context3(codec) @@ -155,11 +155,11 @@ function avcodec_alloc_frame() end function avcodec_get_frame_defaults(frame) - ccall((:avcodec_get_frame_defaults,libavcodec),Void,(Ptr{AVFrame},),frame) + ccall((:avcodec_get_frame_defaults,libavcodec),Cvoid,(Ptr{AVFrame},),frame) end function avcodec_free_frame(frame) - ccall((:avcodec_free_frame,libavcodec),Void,(Ptr{Ptr{AVFrame}},),frame) + ccall((:avcodec_free_frame,libavcodec),Cvoid,(Ptr{Ptr{AVFrame}},),frame) end function avcodec_open2(avctx,codec,options) @@ -171,15 +171,15 @@ function avcodec_close(avctx) end function avsubtitle_free(sub) - ccall((:avsubtitle_free,libavcodec),Void,(Ptr{AVSubtitle},),sub) + ccall((:avsubtitle_free,libavcodec),Cvoid,(Ptr{AVSubtitle},),sub) end function av_destruct_packet(pkt) - ccall((:av_destruct_packet,libavcodec),Void,(Ptr{AVPacket},),pkt) + ccall((:av_destruct_packet,libavcodec),Cvoid,(Ptr{AVPacket},),pkt) end function av_init_packet(pkt) - ccall((:av_init_packet,libavcodec),Void,(Ptr{AVPacket},),pkt) + ccall((:av_init_packet,libavcodec),Cvoid,(Ptr{AVPacket},),pkt) end function av_new_packet(pkt,size::Integer) @@ -187,7 +187,7 @@ function av_new_packet(pkt,size::Integer) end function av_shrink_packet(pkt,size::Integer) - ccall((:av_shrink_packet,libavcodec),Void,(Ptr{AVPacket},Cint),pkt,size) + ccall((:av_shrink_packet,libavcodec),Cvoid,(Ptr{AVPacket},Cint),pkt,size) end function av_grow_packet(pkt,grow_by::Integer) @@ -199,7 +199,7 @@ function av_dup_packet(pkt) end function av_free_packet(pkt) - ccall((:av_free_packet,libavcodec),Void,(Ptr{AVPacket},),pkt) + ccall((:av_free_packet,libavcodec),Cvoid,(Ptr{AVPacket},),pkt) end function av_packet_new_side_data(pkt,_type::AVPacketSideDataType,size::Integer) @@ -227,7 +227,7 @@ function avcodec_default_get_buffer(s,pic) end function avcodec_default_release_buffer(s,pic) - ccall((:avcodec_default_release_buffer,libavcodec),Void,(Ptr{AVCodecContext},Ptr{AVFrame}),s,pic) + ccall((:avcodec_default_release_buffer,libavcodec),Cvoid,(Ptr{AVCodecContext},Ptr{AVFrame}),s,pic) end function avcodec_default_reget_buffer(s,pic) @@ -239,11 +239,11 @@ function avcodec_get_edge_width() end function avcodec_align_dimensions(s,width,height) - ccall((:avcodec_align_dimensions,libavcodec),Void,(Ptr{AVCodecContext},Ptr{Cint},Ptr{Cint}),s,width,height) + ccall((:avcodec_align_dimensions,libavcodec),Cvoid,(Ptr{AVCodecContext},Ptr{Cint},Ptr{Cint}),s,width,height) end function avcodec_align_dimensions2(s,width,height,linesize_align) - ccall((:avcodec_align_dimensions2,libavcodec),Void,(Ptr{AVCodecContext},Ptr{Cint},Ptr{Cint},Ptr{Cint}),s,width,height,linesize_align) + ccall((:avcodec_align_dimensions2,libavcodec),Cvoid,(Ptr{AVCodecContext},Ptr{Cint},Ptr{Cint},Ptr{Cint}),s,width,height,linesize_align) end function avcodec_decode_audio3(avctx,samples,frame_size_ptr,avpkt) @@ -267,7 +267,7 @@ function av_parser_next(c) end function av_register_codec_parser(parser) - ccall((:av_register_codec_parser,libavcodec),Void,(Ptr{AVCodecParser},),parser) + ccall((:av_register_codec_parser,libavcodec),Cvoid,(Ptr{AVCodecParser},),parser) end function av_parser_init(codec_id::Integer) @@ -283,7 +283,7 @@ function av_parser_change(s,avctx,poutbuf,poutbuf_size,buf,buf_size::Integer,key end function av_parser_close(s) - ccall((:av_parser_close,libavcodec),Void,(Ptr{AVCodecParserContext},),s) + ccall((:av_parser_close,libavcodec),Cvoid,(Ptr{AVCodecParserContext},),s) end function avcodec_find_encoder(id::AVCodecID) @@ -323,7 +323,7 @@ function audio_resample(s,output,input,nb_samples::Integer) end function audio_resample_close(s) - ccall((:audio_resample_close,libavcodec),Void,(Ptr{ReSampleContext},),s) + ccall((:audio_resample_close,libavcodec),Cvoid,(Ptr{ReSampleContext},),s) end function av_resample_init(out_rate::Integer,in_rate::Integer,filter_length::Integer,log2_phase_count::Integer,linear::Integer,cutoff::Cdouble) @@ -335,11 +335,11 @@ function av_resample(c,dst,src,consumed,src_size::Integer,dst_size::Integer,upda end function av_resample_compensate(c,sample_delta::Integer,compensation_distance::Integer) - ccall((:av_resample_compensate,libavcodec),Void,(Ptr{AVResampleContext},Cint,Cint),c,sample_delta,compensation_distance) + ccall((:av_resample_compensate,libavcodec),Cvoid,(Ptr{AVResampleContext},Cint,Cint),c,sample_delta,compensation_distance) end function av_resample_close(c) - ccall((:av_resample_close,libavcodec),Void,(Ptr{AVResampleContext},),c) + ccall((:av_resample_close,libavcodec),Cvoid,(Ptr{AVResampleContext},),c) end function avpicture_alloc(picture,pix_fmt::AVPixelFormat,width::Integer,height::Integer) @@ -347,7 +347,7 @@ function avpicture_alloc(picture,pix_fmt::AVPixelFormat,width::Integer,height::I end function avpicture_free(picture) - ccall((:avpicture_free,libavcodec),Void,(Ptr{AVPicture},),picture) + ccall((:avpicture_free,libavcodec),Cvoid,(Ptr{AVPicture},),picture) end function avpicture_fill(picture,ptr,pix_fmt::AVPixelFormat,width::Integer,height::Integer) @@ -367,7 +367,7 @@ function avpicture_deinterlace(dst,src,pix_fmt::AVPixelFormat,width::Integer,hei end function av_picture_copy(dst,src,pix_fmt::AVPixelFormat,width::Integer,height::Integer) - ccall((:av_picture_copy,libavcodec),Void,(Ptr{AVPicture},Ptr{AVPicture},AVPixelFormat,Cint,Cint),dst,src,pix_fmt,width,height) + ccall((:av_picture_copy,libavcodec),Cvoid,(Ptr{AVPicture},Ptr{AVPicture},AVPixelFormat,Cint,Cint),dst,src,pix_fmt,width,height) end function av_picture_crop(dst,src,pix_fmt::AVPixelFormat,top_band::Integer,left_band::Integer) @@ -379,7 +379,7 @@ function av_picture_pad(dst,src,height::Integer,width::Integer,pix_fmt::AVPixelF end function avcodec_get_chroma_sub_sample(pix_fmt::AVPixelFormat,h_shift,v_shift) - ccall((:avcodec_get_chroma_sub_sample,libavcodec),Void,(AVPixelFormat,Ptr{Cint},Ptr{Cint}),pix_fmt,h_shift,v_shift) + ccall((:avcodec_get_chroma_sub_sample,libavcodec),Cvoid,(AVPixelFormat,Ptr{Cint},Ptr{Cint}),pix_fmt,h_shift,v_shift) end function avcodec_pix_fmt_to_codec_tag(pix_fmt::AVPixelFormat) @@ -403,7 +403,7 @@ function avcodec_default_get_format(s,fmt) end function avcodec_set_dimensions(s,width::Integer,height::Integer) - ccall((:avcodec_set_dimensions,libavcodec),Void,(Ptr{AVCodecContext},Cint,Cint),s,width,height) + ccall((:avcodec_set_dimensions,libavcodec),Cvoid,(Ptr{AVCodecContext},Cint,Cint),s,width,height) end function av_get_codec_tag_string(buf,buf_size::Csize_t,codec_tag::Integer) @@ -411,7 +411,7 @@ function av_get_codec_tag_string(buf,buf_size::Csize_t,codec_tag::Integer) end function avcodec_string(buf,buf_size::Integer,enc,encode::Integer) - ccall((:avcodec_string,libavcodec),Void,(Ptr{UInt8},Cint,Ptr{AVCodecContext},Cint),buf,buf_size,enc,encode) + ccall((:avcodec_string,libavcodec),Cvoid,(Ptr{UInt8},Cint,Ptr{AVCodecContext},Cint),buf,buf_size,enc,encode) end function av_get_profile_name(codec,profile::Integer) @@ -419,11 +419,11 @@ function av_get_profile_name(codec,profile::Integer) end function avcodec_default_execute(c,func,arg,ret,count::Integer,size::Integer) - ccall((:avcodec_default_execute,libavcodec),Cint,(Ptr{AVCodecContext},Ptr{Void},Ptr{Void},Ptr{Cint},Cint,Cint),c,func,arg,ret,count,size) + ccall((:avcodec_default_execute,libavcodec),Cint,(Ptr{AVCodecContext},Ptr{Cvoid},Ptr{Cvoid},Ptr{Cint},Cint,Cint),c,func,arg,ret,count,size) end function avcodec_default_execute2(c,func,arg,ret,count::Integer) - ccall((:avcodec_default_execute2,libavcodec),Cint,(Ptr{AVCodecContext},Ptr{Void},Ptr{Void},Ptr{Cint},Cint),c,func,arg,ret,count) + ccall((:avcodec_default_execute2,libavcodec),Cint,(Ptr{AVCodecContext},Ptr{Cvoid},Ptr{Cvoid},Ptr{Cint},Cint),c,func,arg,ret,count) end function avcodec_fill_audio_frame(frame,nb_channels::Integer,sample_fmt::AVSampleFormat,buf,buf_size::Integer,align::Integer) @@ -431,11 +431,11 @@ function avcodec_fill_audio_frame(frame,nb_channels::Integer,sample_fmt::AVSampl end function avcodec_flush_buffers(avctx) - ccall((:avcodec_flush_buffers,libavcodec),Void,(Ptr{AVCodecContext},),avctx) + ccall((:avcodec_flush_buffers,libavcodec),Cvoid,(Ptr{AVCodecContext},),avctx) end function avcodec_default_free_buffers(s) - ccall((:avcodec_default_free_buffers,libavcodec),Void,(Ptr{AVCodecContext},),s) + ccall((:avcodec_default_free_buffers,libavcodec),Cvoid,(Ptr{AVCodecContext},),s) end function av_get_bits_per_sample(codec_id::AVCodecID) @@ -451,7 +451,7 @@ function av_get_audio_frame_duration(avctx,frame_bytes::Integer) end function av_register_bitstream_filter(bsf) - ccall((:av_register_bitstream_filter,libavcodec),Void,(Ptr{AVBitStreamFilter},),bsf) + ccall((:av_register_bitstream_filter,libavcodec),Cvoid,(Ptr{AVBitStreamFilter},),bsf) end function av_bitstream_filter_init(name) @@ -463,7 +463,7 @@ function av_bitstream_filter_filter(bsfc,avctx,args,poutbuf,poutbuf_size,buf,buf end function av_bitstream_filter_close(bsf) - ccall((:av_bitstream_filter_close,libavcodec),Void,(Ptr{AVBitStreamFilterContext},),bsf) + ccall((:av_bitstream_filter_close,libavcodec),Cvoid,(Ptr{AVBitStreamFilterContext},),bsf) end function av_bitstream_filter_next(f) @@ -471,15 +471,15 @@ function av_bitstream_filter_next(f) end function av_fast_realloc(ptr,size,min_size::Csize_t) - ccall((:av_fast_realloc,libavcodec),Ptr{Void},(Ptr{Void},Ptr{UInt32},Csize_t),ptr,size,min_size) + ccall((:av_fast_realloc,libavcodec),Ptr{Cvoid},(Ptr{Cvoid},Ptr{UInt32},Csize_t),ptr,size,min_size) end function av_fast_malloc(ptr,size,min_size::Csize_t) - ccall((:av_fast_malloc,libavcodec),Void,(Ptr{Void},Ptr{UInt32},Csize_t),ptr,size,min_size) + ccall((:av_fast_malloc,libavcodec),Cvoid,(Ptr{Cvoid},Ptr{UInt32},Csize_t),ptr,size,min_size) end function av_fast_padded_malloc(ptr,size,min_size::Csize_t) - ccall((:av_fast_padded_malloc,libavcodec),Void,(Ptr{Void},Ptr{UInt32},Csize_t),ptr,size,min_size) + ccall((:av_fast_padded_malloc,libavcodec),Cvoid,(Ptr{Cvoid},Ptr{UInt32},Csize_t),ptr,size,min_size) end function av_xiphlacing(s,v::Integer) @@ -487,11 +487,11 @@ function av_xiphlacing(s,v::Integer) end function av_log_missing_feature(avc,feature,want_sample::Integer) - ccall((:av_log_missing_feature,libavcodec),Void,(Ptr{Void},Ptr{UInt8},Cint),avc,feature,want_sample) + ccall((:av_log_missing_feature,libavcodec),Cvoid,(Ptr{Cvoid},Ptr{UInt8},Cint),avc,feature,want_sample) end function av_register_hwaccel(hwaccel) - ccall((:av_register_hwaccel,libavcodec),Void,(Ptr{AVHWAccel},),hwaccel) + ccall((:av_register_hwaccel,libavcodec),Cvoid,(Ptr{AVHWAccel},),hwaccel) end function av_hwaccel_next(hwaccel) @@ -499,7 +499,7 @@ function av_hwaccel_next(hwaccel) end function av_lockmgr_register(cb) - ccall((:av_lockmgr_register,libavcodec),Cint,(Ptr{Void},),cb) + ccall((:av_lockmgr_register,libavcodec),Cint,(Ptr{Cvoid},),cb) end function avcodec_get_type(codec_id::AVCodecID) diff --git a/src/libav/AVCodecs/v54/libavcodec_h.jl b/src/libav/AVCodecs/v54/libavcodec_h.jl index afe807ed..36cdc589 100644 --- a/src/libav/AVCodecs/v54/libavcodec_h.jl +++ b/src/libav/AVCodecs/v54/libavcodec_h.jl @@ -1913,11 +1913,11 @@ struct AVPacket size::Cint stream_index::Cint flags::Cint - side_data::Ptr{Void} + side_data::Ptr{Cvoid} side_data_elems::Cint duration::Cint - destruct::Ptr{Void} - priv::Ptr{Void} + destruct::Ptr{Cvoid} + priv::Ptr{Cvoid} pos::Int64 convergence_duration::Int64 end @@ -1957,8 +1957,8 @@ end zero(::Type{Array_8_Cint}) = Array_8_Cint(fill(zero(Cint),8)...) struct Array_2_Ptr - d1::Ptr{Void} - d2::Ptr{Void} + d1::Ptr{Cvoid} + d2::Ptr{Cvoid} end zero(::Type{Array_2_Ptr}) = Array_2_Ptr(fill(C_NULL,2)...) @@ -1981,7 +1981,7 @@ struct AVProfile name::Ptr{UInt8} end -const AVCodecDefault=Void +const AVCodecDefault=Nothing struct AVCodec name::Ptr{UInt8} @@ -1999,16 +1999,16 @@ struct AVCodec profiles::Ptr{AVProfile} priv_data_size::Cint next::Ptr{AVCodec} - init_thread_copy::Ptr{Void} - update_thread_context::Ptr{Void} + init_thread_copy::Ptr{Cvoid} + update_thread_context::Ptr{Cvoid} defaults::Ptr{AVCodecDefault} - init_static_data::Ptr{Void} - init::Ptr{Void} - encode_sub::Ptr{Void} - encode2::Ptr{Void} - decode::Ptr{Void} - close::Ptr{Void} - flush::Ptr{Void} + init_static_data::Ptr{Cvoid} + init::Ptr{Cvoid} + encode_sub::Ptr{Cvoid} + encode2::Ptr{Cvoid} + decode::Ptr{Cvoid} + close::Ptr{Cvoid} + flush::Ptr{Cvoid} end struct Array_32_Uint8 @@ -2048,7 +2048,7 @@ end zero(::Type{Array_32_Uint8}) = Array_32_Uint8(fill(zero(UInt8),32)...) -const AVCodecInternal=Void +const AVCodecInternal=Nothing # begin enum AVFieldOrder const AVFieldOrder=UInt32 @@ -2067,9 +2067,9 @@ struct AVHWAccel pix_fmt::AVPixelFormat capabilities::Cint next::Ptr{AVHWAccel} - start_frame::Ptr{Void} - decode_slice::Ptr{Void} - end_frame::Ptr{Void} + start_frame::Ptr{Cvoid} + decode_slice::Ptr{Cvoid} + end_frame::Ptr{Cvoid} priv_data_size::Cint end @@ -2083,9 +2083,9 @@ struct AVCodecContext codec_tag::UInt32 stream_codec_tag::UInt32 sub_id::Cint - priv_data::Ptr{Void} + priv_data::Ptr{Cvoid} internal::Ptr{AVCodecInternal} - opaque::Ptr{Void} + opaque::Ptr{Cvoid} bit_rate::Cint bit_rate_tolerance::Cint global_quality::Cint @@ -2104,8 +2104,8 @@ struct AVCodecContext gop_size::Cint pix_fmt::AVPixelFormat me_method::Cint - draw_horiz_band::Ptr{Void} - get_format::Ptr{Void} + draw_horiz_band::Ptr{Cvoid} + get_format::Ptr{Cvoid} max_b_frames::Cint b_quant_factor::Cfloat rc_strategy::Cint @@ -2186,9 +2186,9 @@ struct AVCodecContext request_channel_layout::UInt64 audio_service_type::AVAudioServiceType request_sample_fmt::AVSampleFormat - get_buffer::Ptr{Void} - release_buffer::Ptr{Void} - reget_buffer::Ptr{Void} + get_buffer::Ptr{Cvoid} + release_buffer::Ptr{Cvoid} + reget_buffer::Ptr{Cvoid} qcompress::Cfloat qblur::Cfloat qmin::Cint @@ -2220,7 +2220,7 @@ struct AVCodecContext min_prediction_order::Cint max_prediction_order::Cint timecode_frame_start::Int64 - rtp_callback::Ptr{Void} + rtp_callback::Ptr{Cvoid} rtp_payload_size::Cint mv_bits::Cint header_bits::Cint @@ -2241,7 +2241,7 @@ struct AVCodecContext err_recognition::Cint reordered_opaque::Int64 hwaccel::Ptr{AVHWAccel} - hwaccel_context::Ptr{Void} + hwaccel_context::Ptr{Cvoid} error::Array_8_Uint64 dct_algo::Cint idct_algo::Cint @@ -2249,14 +2249,14 @@ struct AVCodecContext bits_per_coded_sample::Cint bits_per_raw_sample::Cint lowres::Cint - coded_frame::Ptr{Void} #Ptr{AVFrame} + coded_frame::Ptr{Cvoid} #Ptr{AVFrame} thread_count::Cint thread_type::Cint active_thread_type::Cint thread_safe_callbacks::Cint - execute::Ptr{Void} - execute2::Ptr{Void} - thread_opaque::Ptr{Void} + execute::Ptr{Cvoid} + execute2::Ptr{Cvoid} + thread_opaque::Ptr{Cvoid} nsse_weight::Cint profile::Cint level::Cint @@ -2297,7 +2297,7 @@ struct AVFrame mb_type::Ptr{UInt32} dct_coeff::Ptr{Int16} ref_index::Array_2_Ptr - opaque::Ptr{Void} + opaque::Ptr{Cvoid} error::Array_8_Uint64 _type::Cint repeat_pict::Cint @@ -2307,9 +2307,9 @@ struct AVFrame buffer_hints::Cint pan_scan::Ptr{AVPanScan} reordered_opaque::Int64 - hwaccel_picture_private::Ptr{Void} + hwaccel_picture_private::Ptr{Cvoid} owner::Ptr{AVCodecContext} - thread_opaque::Ptr{Void} + thread_opaque::Ptr{Cvoid} motion_subsample_log2::UInt8 sample_rate::Cint channel_layout::UInt64 @@ -2372,15 +2372,15 @@ zero(::Type{Array_5_Cint}) = Array_5_Cint(fill(zero(Cint),5)...) struct AVCodecParser codec_ids::Array_5_Cint priv_data_size::Cint - parser_init::Ptr{Void} - parser_parse::Ptr{Void} - parser_close::Ptr{Void} - split::Ptr{Void} + parser_init::Ptr{Cvoid} + parser_parse::Ptr{Cvoid} + parser_close::Ptr{Cvoid} + split::Ptr{Cvoid} next::Ptr{AVCodecParser} end struct AVCodecParserContext - priv_data::Ptr{Void} + priv_data::Ptr{Cvoid} parser::Ptr{AVCodecParser} frame_offset::Int64 cur_offset::Int64 @@ -2410,19 +2410,19 @@ struct AVCodecParserContext duration::Cint end -const ReSampleContext=Void -const AVResampleContext=Void +const ReSampleContext=Nothing +const AVResampleContext=Nothing struct AVBitStreamFilter name::Ptr{UInt8} priv_data_size::Cint - filter::Ptr{Void} - close::Ptr{Void} + filter::Ptr{Cvoid} + close::Ptr{Cvoid} next::Ptr{AVBitStreamFilter} end struct AVBitStreamFilterContext - priv_data::Ptr{Void} + priv_data::Ptr{Cvoid} filter::Ptr{AVBitStreamFilter} parser::Ptr{AVCodecParserContext} next::Ptr{AVBitStreamFilterContext} diff --git a/src/libav/AVCodecs/v55/avcodec.jl b/src/libav/AVCodecs/v55/avcodec.jl index bf7622a1..26abbee6 100644 --- a/src/libav/AVCodecs/v55/avcodec.jl +++ b/src/libav/AVCodecs/v55/avcodec.jl @@ -120,11 +120,11 @@ function avcodec_license() end function avcodec_register(codec) - ccall((:avcodec_register,libavcodec),Void,(Ptr{AVCodec},),codec) + ccall((:avcodec_register,libavcodec),Cvoid,(Ptr{AVCodec},),codec) end function avcodec_register_all() - ccall((:avcodec_register_all,libavcodec),Void,()) + ccall((:avcodec_register_all,libavcodec),Cvoid,()) end function avcodec_alloc_context3(codec) @@ -148,11 +148,11 @@ function avcodec_alloc_frame() end function avcodec_get_frame_defaults(frame) - ccall((:avcodec_get_frame_defaults,libavcodec),Void,(Ptr{AVFrame},),frame) + ccall((:avcodec_get_frame_defaults,libavcodec),Cvoid,(Ptr{AVFrame},),frame) end function avcodec_free_frame(frame) - ccall((:avcodec_free_frame,libavcodec),Void,(Ptr{Ptr{AVFrame}},),frame) + ccall((:avcodec_free_frame,libavcodec),Cvoid,(Ptr{Ptr{AVFrame}},),frame) end function avcodec_open2(avctx,codec,options) @@ -164,15 +164,15 @@ function avcodec_close(avctx) end function avsubtitle_free(sub) - ccall((:avsubtitle_free,libavcodec),Void,(Ptr{AVSubtitle},),sub) + ccall((:avsubtitle_free,libavcodec),Cvoid,(Ptr{AVSubtitle},),sub) end function av_destruct_packet(pkt) - ccall((:av_destruct_packet,libavcodec),Void,(Ptr{AVPacket},),pkt) + ccall((:av_destruct_packet,libavcodec),Cvoid,(Ptr{AVPacket},),pkt) end function av_init_packet(pkt) - ccall((:av_init_packet,libavcodec),Void,(Ptr{AVPacket},),pkt) + ccall((:av_init_packet,libavcodec),Cvoid,(Ptr{AVPacket},),pkt) end function av_new_packet(pkt,size::Integer) @@ -180,7 +180,7 @@ function av_new_packet(pkt,size::Integer) end function av_shrink_packet(pkt,size::Integer) - ccall((:av_shrink_packet,libavcodec),Void,(Ptr{AVPacket},Cint),pkt,size) + ccall((:av_shrink_packet,libavcodec),Cvoid,(Ptr{AVPacket},Cint),pkt,size) end function av_grow_packet(pkt,grow_by::Integer) @@ -196,7 +196,7 @@ function av_dup_packet(pkt) end function av_free_packet(pkt) - ccall((:av_free_packet,libavcodec),Void,(Ptr{AVPacket},),pkt) + ccall((:av_free_packet,libavcodec),Cvoid,(Ptr{AVPacket},),pkt) end function av_packet_new_side_data(pkt,_type::AVPacketSideDataType,size::Integer) @@ -212,7 +212,7 @@ function av_packet_get_side_data(pkt,_type::AVPacketSideDataType,size) end function av_packet_free_side_data(pkt) - ccall((:av_packet_free_side_data,libavcodec),Void,(Ptr{AVPacket},),pkt) + ccall((:av_packet_free_side_data,libavcodec),Cvoid,(Ptr{AVPacket},),pkt) end function av_packet_ref(dst,src) @@ -220,11 +220,11 @@ function av_packet_ref(dst,src) end function av_packet_unref(pkt) - ccall((:av_packet_unref,libavcodec),Void,(Ptr{AVPacket},),pkt) + ccall((:av_packet_unref,libavcodec),Cvoid,(Ptr{AVPacket},),pkt) end function av_packet_move_ref(dst,src) - ccall((:av_packet_move_ref,libavcodec),Void,(Ptr{AVPacket},Ptr{AVPacket}),dst,src) + ccall((:av_packet_move_ref,libavcodec),Cvoid,(Ptr{AVPacket},Ptr{AVPacket}),dst,src) end function av_packet_copy_props(dst,src) @@ -244,7 +244,7 @@ function avcodec_default_get_buffer(s,pic) end function avcodec_default_release_buffer(s,pic) - ccall((:avcodec_default_release_buffer,libavcodec),Void,(Ptr{AVCodecContext},Ptr{AVFrame}),s,pic) + ccall((:avcodec_default_release_buffer,libavcodec),Cvoid,(Ptr{AVCodecContext},Ptr{AVFrame}),s,pic) end function avcodec_default_reget_buffer(s,pic) @@ -260,11 +260,11 @@ function avcodec_get_edge_width() end function avcodec_align_dimensions(s,width,height) - ccall((:avcodec_align_dimensions,libavcodec),Void,(Ptr{AVCodecContext},Ptr{Cint},Ptr{Cint}),s,width,height) + ccall((:avcodec_align_dimensions,libavcodec),Cvoid,(Ptr{AVCodecContext},Ptr{Cint},Ptr{Cint}),s,width,height) end function avcodec_align_dimensions2(s,width,height,linesize_align) - ccall((:avcodec_align_dimensions2,libavcodec),Void,(Ptr{AVCodecContext},Ptr{Cint},Ptr{Cint},Ptr{Cint}),s,width,height,linesize_align) + ccall((:avcodec_align_dimensions2,libavcodec),Cvoid,(Ptr{AVCodecContext},Ptr{Cint},Ptr{Cint},Ptr{Cint}),s,width,height,linesize_align) end function avcodec_decode_audio4(avctx,frame,got_frame_ptr,avpkt) @@ -284,7 +284,7 @@ function av_parser_next(c) end function av_register_codec_parser(parser) - ccall((:av_register_codec_parser,libavcodec),Void,(Ptr{AVCodecParser},),parser) + ccall((:av_register_codec_parser,libavcodec),Cvoid,(Ptr{AVCodecParser},),parser) end function av_parser_init(codec_id::Integer) @@ -300,7 +300,7 @@ function av_parser_change(s,avctx,poutbuf,poutbuf_size,buf,buf_size::Integer,key end function av_parser_close(s) - ccall((:av_parser_close,libavcodec),Void,(Ptr{AVCodecParserContext},),s) + ccall((:av_parser_close,libavcodec),Cvoid,(Ptr{AVCodecParserContext},),s) end function avcodec_find_encoder(id::AVCodecID) @@ -328,7 +328,7 @@ function avpicture_alloc(picture,pix_fmt::AVPixelFormat,width::Integer,height::I end function avpicture_free(picture) - ccall((:avpicture_free,libavcodec),Void,(Ptr{AVPicture},),picture) + ccall((:avpicture_free,libavcodec),Cvoid,(Ptr{AVPicture},),picture) end function avpicture_fill(picture,ptr,pix_fmt::AVPixelFormat,width::Integer,height::Integer) @@ -348,7 +348,7 @@ function avpicture_deinterlace(dst,src,pix_fmt::AVPixelFormat,width::Integer,hei end function av_picture_copy(dst,src,pix_fmt::AVPixelFormat,width::Integer,height::Integer) - ccall((:av_picture_copy,libavcodec),Void,(Ptr{AVPicture},Ptr{AVPicture},AVPixelFormat,Cint,Cint),dst,src,pix_fmt,width,height) + ccall((:av_picture_copy,libavcodec),Cvoid,(Ptr{AVPicture},Ptr{AVPicture},AVPixelFormat,Cint,Cint),dst,src,pix_fmt,width,height) end function av_picture_crop(dst,src,pix_fmt::AVPixelFormat,top_band::Integer,left_band::Integer) @@ -360,7 +360,7 @@ function av_picture_pad(dst,src,height::Integer,width::Integer,pix_fmt::AVPixelF end function avcodec_get_chroma_sub_sample(pix_fmt::AVPixelFormat,h_shift,v_shift) - ccall((:avcodec_get_chroma_sub_sample,libavcodec),Void,(AVPixelFormat,Ptr{Cint},Ptr{Cint}),pix_fmt,h_shift,v_shift) + ccall((:avcodec_get_chroma_sub_sample,libavcodec),Cvoid,(AVPixelFormat,Ptr{Cint},Ptr{Cint}),pix_fmt,h_shift,v_shift) end function avcodec_pix_fmt_to_codec_tag(pix_fmt::AVPixelFormat) @@ -380,7 +380,7 @@ function avcodec_default_get_format(s,fmt) end function avcodec_set_dimensions(s,width::Integer,height::Integer) - ccall((:avcodec_set_dimensions,libavcodec),Void,(Ptr{AVCodecContext},Cint,Cint),s,width,height) + ccall((:avcodec_set_dimensions,libavcodec),Cvoid,(Ptr{AVCodecContext},Cint,Cint),s,width,height) end function av_get_codec_tag_string(buf,buf_size::Csize_t,codec_tag::Integer) @@ -388,7 +388,7 @@ function av_get_codec_tag_string(buf,buf_size::Csize_t,codec_tag::Integer) end function avcodec_string(buf,buf_size::Integer,enc,encode::Integer) - ccall((:avcodec_string,libavcodec),Void,(Ptr{UInt8},Cint,Ptr{AVCodecContext},Cint),buf,buf_size,enc,encode) + ccall((:avcodec_string,libavcodec),Cvoid,(Ptr{UInt8},Cint,Ptr{AVCodecContext},Cint),buf,buf_size,enc,encode) end function av_get_profile_name(codec,profile::Integer) @@ -396,11 +396,11 @@ function av_get_profile_name(codec,profile::Integer) end function avcodec_default_execute(c,func,arg,ret,count::Integer,size::Integer) - ccall((:avcodec_default_execute,libavcodec),Cint,(Ptr{AVCodecContext},Ptr{Void},Ptr{Void},Ptr{Cint},Cint,Cint),c,func,arg,ret,count,size) + ccall((:avcodec_default_execute,libavcodec),Cint,(Ptr{AVCodecContext},Ptr{Cvoid},Ptr{Cvoid},Ptr{Cint},Cint,Cint),c,func,arg,ret,count,size) end function avcodec_default_execute2(c,func,arg,ret,count::Integer) - ccall((:avcodec_default_execute2,libavcodec),Cint,(Ptr{AVCodecContext},Ptr{Void},Ptr{Void},Ptr{Cint},Cint),c,func,arg,ret,count) + ccall((:avcodec_default_execute2,libavcodec),Cint,(Ptr{AVCodecContext},Ptr{Cvoid},Ptr{Cvoid},Ptr{Cint},Cint),c,func,arg,ret,count) end function avcodec_fill_audio_frame(frame,nb_channels::Integer,sample_fmt::AVSampleFormat,buf,buf_size::Integer,align::Integer) @@ -408,7 +408,7 @@ function avcodec_fill_audio_frame(frame,nb_channels::Integer,sample_fmt::AVSampl end function avcodec_flush_buffers(avctx) - ccall((:avcodec_flush_buffers,libavcodec),Void,(Ptr{AVCodecContext},),avctx) + ccall((:avcodec_flush_buffers,libavcodec),Cvoid,(Ptr{AVCodecContext},),avctx) end function av_get_bits_per_sample(codec_id::AVCodecID) @@ -424,7 +424,7 @@ function av_get_audio_frame_duration(avctx,frame_bytes::Integer) end function av_register_bitstream_filter(bsf) - ccall((:av_register_bitstream_filter,libavcodec),Void,(Ptr{AVBitStreamFilter},),bsf) + ccall((:av_register_bitstream_filter,libavcodec),Cvoid,(Ptr{AVBitStreamFilter},),bsf) end function av_bitstream_filter_init(name) @@ -436,7 +436,7 @@ function av_bitstream_filter_filter(bsfc,avctx,args,poutbuf,poutbuf_size,buf,buf end function av_bitstream_filter_close(bsf) - ccall((:av_bitstream_filter_close,libavcodec),Void,(Ptr{AVBitStreamFilterContext},),bsf) + ccall((:av_bitstream_filter_close,libavcodec),Cvoid,(Ptr{AVBitStreamFilterContext},),bsf) end function av_bitstream_filter_next(f) @@ -444,7 +444,7 @@ function av_bitstream_filter_next(f) end function av_fast_padded_malloc(ptr,size,min_size::Csize_t) - ccall((:av_fast_padded_malloc,libavcodec),Void,(Ptr{Void},Ptr{UInt32},Csize_t),ptr,size,min_size) + ccall((:av_fast_padded_malloc,libavcodec),Cvoid,(Ptr{Cvoid},Ptr{UInt32},Csize_t),ptr,size,min_size) end function av_xiphlacing(s,v::Integer) @@ -452,11 +452,11 @@ function av_xiphlacing(s,v::Integer) end function av_log_missing_feature(avc,feature,want_sample::Integer) - ccall((:av_log_missing_feature,libavcodec),Void,(Ptr{Void},Ptr{UInt8},Cint),avc,feature,want_sample) + ccall((:av_log_missing_feature,libavcodec),Cvoid,(Ptr{Cvoid},Ptr{UInt8},Cint),avc,feature,want_sample) end function av_register_hwaccel(hwaccel) - ccall((:av_register_hwaccel,libavcodec),Void,(Ptr{AVHWAccel},),hwaccel) + ccall((:av_register_hwaccel,libavcodec),Cvoid,(Ptr{AVHWAccel},),hwaccel) end function av_hwaccel_next(hwaccel) @@ -464,7 +464,7 @@ function av_hwaccel_next(hwaccel) end function av_lockmgr_register(cb) - ccall((:av_lockmgr_register,libavcodec),Cint,(Ptr{Void},),cb) + ccall((:av_lockmgr_register,libavcodec),Cint,(Ptr{Cvoid},),cb) end function avcodec_get_type(codec_id::AVCodecID) diff --git a/src/libav/AVCodecs/v55/libavcodec_h.jl b/src/libav/AVCodecs/v55/libavcodec_h.jl index 4f9dc1e5..b540c174 100644 --- a/src/libav/AVCodecs/v55/libavcodec_h.jl +++ b/src/libav/AVCodecs/v55/libavcodec_h.jl @@ -1326,11 +1326,11 @@ struct AVPacket size::Cint stream_index::Cint flags::Cint - side_data::Ptr{Void} + side_data::Ptr{Cvoid} side_data_elems::Cint duration::Cint - destruct::Ptr{Void} - priv::Ptr{Void} + destruct::Ptr{Cvoid} + priv::Ptr{Cvoid} pos::Int64 convergence_duration::Int64 end @@ -1343,7 +1343,7 @@ const AV_SIDE_DATA_PARAM_CHANGE_SAMPLE_RATE = UInt32(4) const AV_SIDE_DATA_PARAM_CHANGE_DIMENSIONS = UInt32(8) # end enum AVSideDataParamChangeFlags -const AVCodecInternal=Void +const AVCodecInternal=Nothing # begin enum AVFieldOrder const AVFieldOrder=UInt32 @@ -1410,7 +1410,7 @@ struct AVProfile name::Ptr{UInt8} end -const AVCodecDefault=Void +const AVCodecDefault=Nothing struct AVCodec name::Ptr{UInt8} @@ -1428,16 +1428,16 @@ struct AVCodec profiles::Ptr{AVProfile} priv_data_size::Cint next::Ptr{AVCodec} - init_thread_copy::Ptr{Void} - update_thread_context::Ptr{Void} + init_thread_copy::Ptr{Cvoid} + update_thread_context::Ptr{Cvoid} defaults::Ptr{AVCodecDefault} - init_static_data::Ptr{Void} - init::Ptr{Void} - encode_sub::Ptr{Void} - encode2::Ptr{Void} - decode::Ptr{Void} - close::Ptr{Void} - flush::Ptr{Void} + init_static_data::Ptr{Cvoid} + init::Ptr{Cvoid} + encode_sub::Ptr{Cvoid} + encode2::Ptr{Cvoid} + decode::Ptr{Cvoid} + close::Ptr{Cvoid} + flush::Ptr{Cvoid} end struct AVHWAccel @@ -1447,9 +1447,9 @@ struct AVHWAccel pix_fmt::AVPixelFormat capabilities::Cint next::Ptr{AVHWAccel} - start_frame::Ptr{Void} - decode_slice::Ptr{Void} - end_frame::Ptr{Void} + start_frame::Ptr{Cvoid} + decode_slice::Ptr{Cvoid} + end_frame::Ptr{Cvoid} priv_data_size::Cint end @@ -1462,9 +1462,9 @@ struct AVCodecContext codec_id::AVCodecID codec_tag::UInt32 stream_codec_tag::UInt32 - priv_data::Ptr{Void} + priv_data::Ptr{Cvoid} internal::Ptr{AVCodecInternal} - opaque::Ptr{Void} + opaque::Ptr{Cvoid} bit_rate::Cint bit_rate_tolerance::Cint global_quality::Cint @@ -1483,8 +1483,8 @@ struct AVCodecContext gop_size::Cint pix_fmt::AVPixelFormat me_method::Cint - draw_horiz_band::Ptr{Void} - get_format::Ptr{Void} + draw_horiz_band::Ptr{Cvoid} + get_format::Ptr{Cvoid} max_b_frames::Cint b_quant_factor::Cfloat rc_strategy::Cint @@ -1560,10 +1560,10 @@ struct AVCodecContext request_channel_layout::UInt64 audio_service_type::AVAudioServiceType request_sample_fmt::AVSampleFormat - get_buffer::Ptr{Void} - release_buffer::Ptr{Void} - reget_buffer::Ptr{Void} - get_buffer2::Ptr{Void} + get_buffer::Ptr{Cvoid} + release_buffer::Ptr{Cvoid} + reget_buffer::Ptr{Cvoid} + get_buffer2::Ptr{Cvoid} refcounted_frames::Cint qcompress::Cfloat qblur::Cfloat @@ -1596,7 +1596,7 @@ struct AVCodecContext min_prediction_order::Cint max_prediction_order::Cint timecode_frame_start::Int64 - rtp_callback::Ptr{Void} + rtp_callback::Ptr{Cvoid} rtp_payload_size::Cint mv_bits::Cint header_bits::Cint @@ -1617,7 +1617,7 @@ struct AVCodecContext err_recognition::Cint reordered_opaque::Int64 hwaccel::Ptr{AVHWAccel} - hwaccel_context::Ptr{Void} + hwaccel_context::Ptr{Cvoid} error::Array_8_Uint64 dct_algo::Cint idct_algo::Cint @@ -1629,9 +1629,9 @@ struct AVCodecContext thread_type::Cint active_thread_type::Cint thread_safe_callbacks::Cint - execute::Ptr{Void} - execute2::Ptr{Void} - thread_opaque::Ptr{Void} + execute::Ptr{Cvoid} + execute2::Ptr{Cvoid} + thread_opaque::Ptr{Cvoid} nsse_weight::Cint profile::Cint level::Cint @@ -1736,15 +1736,15 @@ zero(::Type{Array_5_Cint}) = Array_5_Cint(fill(zero(Cint),5)...) struct AVCodecParser codec_ids::Array_5_Cint priv_data_size::Cint - parser_init::Ptr{Void} - parser_parse::Ptr{Void} - parser_close::Ptr{Void} - split::Ptr{Void} + parser_init::Ptr{Cvoid} + parser_parse::Ptr{Cvoid} + parser_close::Ptr{Cvoid} + split::Ptr{Cvoid} next::Ptr{AVCodecParser} end struct AVCodecParserContext - priv_data::Ptr{Void} + priv_data::Ptr{Cvoid} parser::Ptr{AVCodecParser} frame_offset::Int64 cur_offset::Int64 @@ -1780,13 +1780,13 @@ end struct AVBitStreamFilter name::Ptr{UInt8} priv_data_size::Cint - filter::Ptr{Void} - close::Ptr{Void} + filter::Ptr{Cvoid} + close::Ptr{Cvoid} next::Ptr{AVBitStreamFilter} end struct AVBitStreamFilterContext - priv_data::Ptr{Void} + priv_data::Ptr{Cvoid} filter::Ptr{AVBitStreamFilter} parser::Ptr{AVCodecParserContext} next::Ptr{AVBitStreamFilterContext} diff --git a/src/libav/AVDevice/v53/avdevice.jl b/src/libav/AVDevice/v53/avdevice.jl index de6ed51f..32766947 100644 --- a/src/libav/AVDevice/v53/avdevice.jl +++ b/src/libav/AVDevice/v53/avdevice.jl @@ -22,5 +22,5 @@ function avdevice_license() end function avdevice_register_all() - ccall((:avdevice_register_all,libavdevice),Void,()) + ccall((:avdevice_register_all,libavdevice),Cvoid,()) end diff --git a/src/libav/AVDevice/v54/avdevice.jl b/src/libav/AVDevice/v54/avdevice.jl index 5c960ec4..10fd747c 100644 --- a/src/libav/AVDevice/v54/avdevice.jl +++ b/src/libav/AVDevice/v54/avdevice.jl @@ -22,5 +22,5 @@ function avdevice_license() end function avdevice_register_all() - ccall((:avdevice_register_all,libavdevice),Void,()) + ccall((:avdevice_register_all,libavdevice),Cvoid,()) end diff --git a/src/libav/AVFilters/v2/avfilter.jl b/src/libav/AVFilters/v2/avfilter.jl index 2f6e9de1..68abbe6f 100644 --- a/src/libav/AVFilters/v2/avfilter.jl +++ b/src/libav/AVFilters/v2/avfilter.jl @@ -71,7 +71,7 @@ function avfilter_license() end function avfilter_copy_buffer_ref_props(dst,src) - ccall((:avfilter_copy_buffer_ref_props,libavfilter),Void,(Ptr{AVFilterBufferRef},Ptr{AVFilterBufferRef}),dst,src) + ccall((:avfilter_copy_buffer_ref_props,libavfilter),Cvoid,(Ptr{AVFilterBufferRef},Ptr{AVFilterBufferRef}),dst,src) end function avfilter_ref_buffer(ref,pmask::Integer) @@ -79,7 +79,7 @@ function avfilter_ref_buffer(ref,pmask::Integer) end function avfilter_unref_buffer(ref) - ccall((:avfilter_unref_buffer,libavfilter),Void,(Ptr{AVFilterBufferRef},),ref) + ccall((:avfilter_unref_buffer,libavfilter),Cvoid,(Ptr{AVFilterBufferRef},),ref) end function avfilter_make_format_list(fmts) @@ -99,31 +99,31 @@ function avfilter_merge_formats(a,b) end function avfilter_formats_ref(formats,ref) - ccall((:avfilter_formats_ref,libavfilter),Void,(Ptr{AVFilterFormats},Ptr{Ptr{AVFilterFormats}}),formats,ref) + ccall((:avfilter_formats_ref,libavfilter),Cvoid,(Ptr{AVFilterFormats},Ptr{Ptr{AVFilterFormats}}),formats,ref) end function avfilter_formats_unref(ref) - ccall((:avfilter_formats_unref,libavfilter),Void,(Ptr{Ptr{AVFilterFormats}},),ref) + ccall((:avfilter_formats_unref,libavfilter),Cvoid,(Ptr{Ptr{AVFilterFormats}},),ref) end function avfilter_formats_changeref(oldref,newref) - ccall((:avfilter_formats_changeref,libavfilter),Void,(Ptr{Ptr{AVFilterFormats}},Ptr{Ptr{AVFilterFormats}}),oldref,newref) + ccall((:avfilter_formats_changeref,libavfilter),Cvoid,(Ptr{Ptr{AVFilterFormats}},Ptr{Ptr{AVFilterFormats}}),oldref,newref) end function avfilter_default_start_frame(link,picref) - ccall((:avfilter_default_start_frame,libavfilter),Void,(Ptr{AVFilterLink},Ptr{AVFilterBufferRef}),link,picref) + ccall((:avfilter_default_start_frame,libavfilter),Cvoid,(Ptr{AVFilterLink},Ptr{AVFilterBufferRef}),link,picref) end function avfilter_default_draw_slice(link,y::Integer,h::Integer,slice_dir::Integer) - ccall((:avfilter_default_draw_slice,libavfilter),Void,(Ptr{AVFilterLink},Cint,Cint,Cint),link,y,h,slice_dir) + ccall((:avfilter_default_draw_slice,libavfilter),Cvoid,(Ptr{AVFilterLink},Cint,Cint,Cint),link,y,h,slice_dir) end function avfilter_default_end_frame(link) - ccall((:avfilter_default_end_frame,libavfilter),Void,(Ptr{AVFilterLink},),link) + ccall((:avfilter_default_end_frame,libavfilter),Cvoid,(Ptr{AVFilterLink},),link) end function avfilter_default_filter_samples(link,samplesref) - ccall((:avfilter_default_filter_samples,libavfilter),Void,(Ptr{AVFilterLink},Ptr{AVFilterBufferRef}),link,samplesref) + ccall((:avfilter_default_filter_samples,libavfilter),Cvoid,(Ptr{AVFilterLink},Ptr{AVFilterBufferRef}),link,samplesref) end function avfilter_default_config_output_link(link) @@ -143,7 +143,7 @@ function avfilter_default_get_audio_buffer(link,perms::Integer,sample_fmt::AVSam end function avfilter_set_common_formats(ctx,formats) - ccall((:avfilter_set_common_formats,libavfilter),Void,(Ptr{AVFilterContext},Ptr{AVFilterFormats}),ctx,formats) + ccall((:avfilter_set_common_formats,libavfilter),Cvoid,(Ptr{AVFilterContext},Ptr{AVFilterFormats}),ctx,formats) end function avfilter_default_query_formats(ctx) @@ -151,19 +151,19 @@ function avfilter_default_query_formats(ctx) end function avfilter_null_start_frame(link,picref) - ccall((:avfilter_null_start_frame,libavfilter),Void,(Ptr{AVFilterLink},Ptr{AVFilterBufferRef}),link,picref) + ccall((:avfilter_null_start_frame,libavfilter),Cvoid,(Ptr{AVFilterLink},Ptr{AVFilterBufferRef}),link,picref) end function avfilter_null_draw_slice(link,y::Integer,h::Integer,slice_dir::Integer) - ccall((:avfilter_null_draw_slice,libavfilter),Void,(Ptr{AVFilterLink},Cint,Cint,Cint),link,y,h,slice_dir) + ccall((:avfilter_null_draw_slice,libavfilter),Cvoid,(Ptr{AVFilterLink},Cint,Cint,Cint),link,y,h,slice_dir) end function avfilter_null_end_frame(link) - ccall((:avfilter_null_end_frame,libavfilter),Void,(Ptr{AVFilterLink},),link) + ccall((:avfilter_null_end_frame,libavfilter),Cvoid,(Ptr{AVFilterLink},),link) end function avfilter_null_filter_samples(link,samplesref) - ccall((:avfilter_null_filter_samples,libavfilter),Void,(Ptr{AVFilterLink},Ptr{AVFilterBufferRef}),link,samplesref) + ccall((:avfilter_null_filter_samples,libavfilter),Cvoid,(Ptr{AVFilterLink},Ptr{AVFilterBufferRef}),link,samplesref) end function avfilter_null_get_video_buffer(link,perms::Integer,w::Integer,h::Integer) @@ -203,27 +203,27 @@ function avfilter_poll_frame(link) end function avfilter_start_frame(link,picref) - ccall((:avfilter_start_frame,libavfilter),Void,(Ptr{AVFilterLink},Ptr{AVFilterBufferRef}),link,picref) + ccall((:avfilter_start_frame,libavfilter),Cvoid,(Ptr{AVFilterLink},Ptr{AVFilterBufferRef}),link,picref) end function avfilter_end_frame(link) - ccall((:avfilter_end_frame,libavfilter),Void,(Ptr{AVFilterLink},),link) + ccall((:avfilter_end_frame,libavfilter),Cvoid,(Ptr{AVFilterLink},),link) end function avfilter_draw_slice(link,y::Integer,h::Integer,slice_dir::Integer) - ccall((:avfilter_draw_slice,libavfilter),Void,(Ptr{AVFilterLink},Cint,Cint,Cint),link,y,h,slice_dir) + ccall((:avfilter_draw_slice,libavfilter),Cvoid,(Ptr{AVFilterLink},Cint,Cint,Cint),link,y,h,slice_dir) end function avfilter_filter_samples(link,samplesref) - ccall((:avfilter_filter_samples,libavfilter),Void,(Ptr{AVFilterLink},Ptr{AVFilterBufferRef}),link,samplesref) + ccall((:avfilter_filter_samples,libavfilter),Cvoid,(Ptr{AVFilterLink},Ptr{AVFilterBufferRef}),link,samplesref) end function avfilter_register_all() - ccall((:avfilter_register_all,libavfilter),Void,()) + ccall((:avfilter_register_all,libavfilter),Cvoid,()) end function avfilter_uninit() - ccall((:avfilter_uninit,libavfilter),Void,()) + ccall((:avfilter_uninit,libavfilter),Cvoid,()) end function avfilter_register(filter) @@ -243,11 +243,11 @@ function avfilter_open(filter_ctx,filter,inst_name) end function avfilter_init_filter(filter,args,opaque) - ccall((:avfilter_init_filter,libavfilter),Cint,(Ptr{AVFilterContext},Ptr{UInt8},Ptr{Void}),filter,args,opaque) + ccall((:avfilter_init_filter,libavfilter),Cint,(Ptr{AVFilterContext},Ptr{UInt8},Ptr{Cvoid}),filter,args,opaque) end function avfilter_free(filter) - ccall((:avfilter_free,libavfilter),Void,(Ptr{AVFilterContext},),filter) + ccall((:avfilter_free,libavfilter),Cvoid,(Ptr{AVFilterContext},),filter) end function avfilter_insert_filter(link,filt,filt_srcpad_idx::Integer,filt_dstpad_idx::Integer) @@ -255,15 +255,15 @@ function avfilter_insert_filter(link,filt,filt_srcpad_idx::Integer,filt_dstpad_i end function avfilter_insert_pad(idx::Integer,count,padidx_off::Csize_t,pads,links,newpad) - ccall((:avfilter_insert_pad,libavfilter),Void,(UInt32,Ptr{UInt32},Csize_t,Ptr{Ptr{AVFilterPad}},Ptr{Ptr{Ptr{AVFilterLink}}},Ptr{AVFilterPad}),idx,count,padidx_off,pads,links,newpad) + ccall((:avfilter_insert_pad,libavfilter),Cvoid,(UInt32,Ptr{UInt32},Csize_t,Ptr{Ptr{AVFilterPad}},Ptr{Ptr{Ptr{AVFilterLink}}},Ptr{AVFilterPad}),idx,count,padidx_off,pads,links,newpad) end function avfilter_insert_inpad(f,index::Integer,p) - ccall((:avfilter_insert_inpad,libavfilter),Void,(Ptr{AVFilterContext},UInt32,Ptr{AVFilterPad}),f,index,p) + ccall((:avfilter_insert_inpad,libavfilter),Cvoid,(Ptr{AVFilterContext},UInt32,Ptr{AVFilterPad}),f,index,p) end function avfilter_insert_outpad(f,index::Integer,p) - ccall((:avfilter_insert_outpad,libavfilter),Void,(Ptr{AVFilterContext},UInt32,Ptr{AVFilterPad}),f,index,p) + ccall((:avfilter_insert_outpad,libavfilter),Cvoid,(Ptr{AVFilterContext},UInt32,Ptr{AVFilterPad}),f,index,p) end function avfilter_copy_frame_props(dst,src) diff --git a/src/libav/AVFilters/v2/avfiltergraph.jl b/src/libav/AVFilters/v2/avfiltergraph.jl index d68621fc..c084a60f 100644 --- a/src/libav/AVFilters/v2/avfiltergraph.jl +++ b/src/libav/AVFilters/v2/avfiltergraph.jl @@ -25,17 +25,17 @@ function avfilter_graph_add_filter(graphctx,filter) end function avfilter_graph_create_filter(filt_ctx,filt,name,args,opaque,graph_ctx) - ccall((:avfilter_graph_create_filter,libavfilter),Cint,(Ptr{Ptr{AVFilterContext}},Ptr{AVFilter},Ptr{UInt8},Ptr{UInt8},Ptr{Void},Ptr{AVFilterGraph}),filt_ctx,filt,name,args,opaque,graph_ctx) + ccall((:avfilter_graph_create_filter,libavfilter),Cint,(Ptr{Ptr{AVFilterContext}},Ptr{AVFilter},Ptr{UInt8},Ptr{UInt8},Ptr{Cvoid},Ptr{AVFilterGraph}),filt_ctx,filt,name,args,opaque,graph_ctx) end function avfilter_graph_config(graphctx,log_ctx) - ccall((:avfilter_graph_config,libavfilter),Cint,(Ptr{AVFilterGraph},Ptr{Void}),graphctx,log_ctx) + ccall((:avfilter_graph_config,libavfilter),Cint,(Ptr{AVFilterGraph},Ptr{Cvoid}),graphctx,log_ctx) end function avfilter_graph_free(graph) - ccall((:avfilter_graph_free,libavfilter),Void,(Ptr{Ptr{AVFilterGraph}},),graph) + ccall((:avfilter_graph_free,libavfilter),Cvoid,(Ptr{Ptr{AVFilterGraph}},),graph) end function avfilter_graph_parse(graph,filters,inputs,outputs,log_ctx) - ccall((:avfilter_graph_parse,libavfilter),Cint,(Ptr{AVFilterGraph},Ptr{UInt8},Ptr{AVFilterInOut},Ptr{AVFilterInOut},Ptr{Void}),graph,filters,inputs,outputs,log_ctx) + ccall((:avfilter_graph_parse,libavfilter),Cint,(Ptr{AVFilterGraph},Ptr{UInt8},Ptr{AVFilterInOut},Ptr{AVFilterInOut},Ptr{Cvoid}),graph,filters,inputs,outputs,log_ctx) end diff --git a/src/libav/AVFilters/v2/libavfilter_h.jl b/src/libav/AVFilters/v2/libavfilter_h.jl index af1419b2..ebf040aa 100644 --- a/src/libav/AVFilters/v2/libavfilter_h.jl +++ b/src/libav/AVFilters/v2/libavfilter_h.jl @@ -65,8 +65,8 @@ struct AVFilterBuffer data::Array_8_Ptr linesize::Array_8_Cint refcount::UInt32 - priv::Ptr{Void} - free::Ptr{Void} + priv::Ptr{Cvoid} + free::Ptr{Cvoid} format::Cint w::Cint h::Cint @@ -113,9 +113,9 @@ end struct AVFilter name::Ptr{UInt8} priv_size::Cint - init::Ptr{Void} - uninit::Ptr{Void} - query_formats::Ptr{Void} + init::Ptr{Cvoid} + uninit::Ptr{Cvoid} + query_formats::Ptr{Cvoid} inputs::Ptr{AVFilterPad} outputs::Ptr{AVFilterPad} description::Ptr{UInt8} diff --git a/src/libav/AVFilters/v3/avfilter.jl b/src/libav/AVFilters/v3/avfilter.jl index 7d3735e9..a08718b8 100644 --- a/src/libav/AVFilters/v3/avfilter.jl +++ b/src/libav/AVFilters/v3/avfilter.jl @@ -42,7 +42,7 @@ function avfilter_license() end function avfilter_copy_buffer_ref_props(dst,src) - ccall((:avfilter_copy_buffer_ref_props,libavfilter),Void,(Ptr{AVFilterBufferRef},Ptr{AVFilterBufferRef}),dst,src) + ccall((:avfilter_copy_buffer_ref_props,libavfilter),Cvoid,(Ptr{AVFilterBufferRef},Ptr{AVFilterBufferRef}),dst,src) end function avfilter_ref_buffer(ref,pmask::Integer) @@ -50,11 +50,11 @@ function avfilter_ref_buffer(ref,pmask::Integer) end function avfilter_unref_buffer(ref) - ccall((:avfilter_unref_buffer,libavfilter),Void,(Ptr{AVFilterBufferRef},),ref) + ccall((:avfilter_unref_buffer,libavfilter),Cvoid,(Ptr{AVFilterBufferRef},),ref) end function avfilter_unref_bufferp(ref) - ccall((:avfilter_unref_bufferp,libavfilter),Void,(Ptr{Ptr{AVFilterBufferRef}},),ref) + ccall((:avfilter_unref_bufferp,libavfilter),Cvoid,(Ptr{Ptr{AVFilterBufferRef}},),ref) end function avfilter_pad_get_name(pads,pad_idx::Integer) @@ -82,11 +82,11 @@ function avfilter_get_audio_buffer_ref_from_arrays(data,linesize::Integer,perms: end function avfilter_register_all() - ccall((:avfilter_register_all,libavfilter),Void,()) + ccall((:avfilter_register_all,libavfilter),Cvoid,()) end function avfilter_uninit() - ccall((:avfilter_uninit,libavfilter),Void,()) + ccall((:avfilter_uninit,libavfilter),Cvoid,()) end function avfilter_register(filter) @@ -106,11 +106,11 @@ function avfilter_open(filter_ctx,filter,inst_name) end function avfilter_init_filter(filter,args,opaque) - ccall((:avfilter_init_filter,libavfilter),Cint,(Ptr{AVFilterContext},Ptr{UInt8},Ptr{Void}),filter,args,opaque) + ccall((:avfilter_init_filter,libavfilter),Cint,(Ptr{AVFilterContext},Ptr{UInt8},Ptr{Cvoid}),filter,args,opaque) end function avfilter_free(filter) - ccall((:avfilter_free,libavfilter),Void,(Ptr{AVFilterContext},),filter) + ccall((:avfilter_free,libavfilter),Cvoid,(Ptr{AVFilterContext},),filter) end function avfilter_insert_filter(link,filt,filt_srcpad_idx::Integer,filt_dstpad_idx::Integer) diff --git a/src/libav/AVFilters/v3/avfiltergraph.jl b/src/libav/AVFilters/v3/avfiltergraph.jl index 1e3e1a18..56265104 100644 --- a/src/libav/AVFilters/v3/avfiltergraph.jl +++ b/src/libav/AVFilters/v3/avfiltergraph.jl @@ -28,15 +28,15 @@ function avfilter_graph_add_filter(graphctx,filter) end function avfilter_graph_create_filter(filt_ctx,filt,name,args,opaque,graph_ctx) - ccall((:avfilter_graph_create_filter,libavfilter),Cint,(Ptr{Ptr{AVFilterContext}},Ptr{AVFilter},Ptr{UInt8},Ptr{UInt8},Ptr{Void},Ptr{AVFilterGraph}),filt_ctx,filt,name,args,opaque,graph_ctx) + ccall((:avfilter_graph_create_filter,libavfilter),Cint,(Ptr{Ptr{AVFilterContext}},Ptr{AVFilter},Ptr{UInt8},Ptr{UInt8},Ptr{Cvoid},Ptr{AVFilterGraph}),filt_ctx,filt,name,args,opaque,graph_ctx) end function avfilter_graph_config(graphctx,log_ctx) - ccall((:avfilter_graph_config,libavfilter),Cint,(Ptr{AVFilterGraph},Ptr{Void}),graphctx,log_ctx) + ccall((:avfilter_graph_config,libavfilter),Cint,(Ptr{AVFilterGraph},Ptr{Cvoid}),graphctx,log_ctx) end function avfilter_graph_free(graph) - ccall((:avfilter_graph_free,libavfilter),Void,(Ptr{Ptr{AVFilterGraph}},),graph) + ccall((:avfilter_graph_free,libavfilter),Cvoid,(Ptr{Ptr{AVFilterGraph}},),graph) end function avfilter_inout_alloc() @@ -44,11 +44,11 @@ function avfilter_inout_alloc() end function avfilter_inout_free(inout) - ccall((:avfilter_inout_free,libavfilter),Void,(Ptr{Ptr{AVFilterInOut}},),inout) + ccall((:avfilter_inout_free,libavfilter),Cvoid,(Ptr{Ptr{AVFilterInOut}},),inout) end function avfilter_graph_parse(graph,filters,inputs,outputs,log_ctx) - ccall((:avfilter_graph_parse,libavfilter),Cint,(Ptr{AVFilterGraph},Ptr{UInt8},Ptr{AVFilterInOut},Ptr{AVFilterInOut},Ptr{Void}),graph,filters,inputs,outputs,log_ctx) + ccall((:avfilter_graph_parse,libavfilter),Cint,(Ptr{AVFilterGraph},Ptr{UInt8},Ptr{AVFilterInOut},Ptr{AVFilterInOut},Ptr{Cvoid}),graph,filters,inputs,outputs,log_ctx) end function avfilter_graph_parse2(graph,filters,inputs,outputs) diff --git a/src/libav/AVFilters/v3/libavfilter_h.jl b/src/libav/AVFilters/v3/libavfilter_h.jl index 30ebd8f2..ad30b1e6 100644 --- a/src/libav/AVFilters/v3/libavfilter_h.jl +++ b/src/libav/AVFilters/v3/libavfilter_h.jl @@ -34,7 +34,7 @@ const AV_PERM_NEG_LINESIZES = 0x20 const AVFilterContext=AVFilterContext const AVFilterLink=AVFilterLink const AVFilterPad=AVFilterPad -const AVFilterFormats=Void +const AVFilterFormats=Nothing struct Array_8_Ptr d1::Ptr{UInt8} @@ -66,8 +66,8 @@ struct AVFilterBuffer data::Array_8_Ptr extended_data::Ptr{Ptr{UInt8}} linesize::Array_8_Cint - priv::Ptr{Void} - free::Ptr{Void} + priv::Ptr{Cvoid} + free::Ptr{Cvoid} format::Cint w::Cint h::Cint @@ -110,9 +110,9 @@ struct AVFilter description::Ptr{UInt8} inputs::Ptr{AVFilterPad} outputs::Ptr{AVFilterPad} - init::Ptr{Void} - uninit::Ptr{Void} - query_formats::Ptr{Void} + init::Ptr{Cvoid} + uninit::Ptr{Cvoid} + query_formats::Ptr{Cvoid} priv_size::Cint end diff --git a/src/libav/AVFilters/v4/avfilter.jl b/src/libav/AVFilters/v4/avfilter.jl index 3b4fc277..db0aa367 100644 --- a/src/libav/AVFilters/v4/avfilter.jl +++ b/src/libav/AVFilters/v4/avfilter.jl @@ -58,7 +58,7 @@ function avfilter_license() end function avfilter_copy_buffer_ref_props(dst,src) - ccall((:avfilter_copy_buffer_ref_props,libavfilter),Void,(Ptr{AVFilterBufferRef},Ptr{AVFilterBufferRef}),dst,src) + ccall((:avfilter_copy_buffer_ref_props,libavfilter),Cvoid,(Ptr{AVFilterBufferRef},Ptr{AVFilterBufferRef}),dst,src) end function avfilter_ref_buffer(ref,pmask::Integer) @@ -66,11 +66,11 @@ function avfilter_ref_buffer(ref,pmask::Integer) end function avfilter_unref_buffer(ref) - ccall((:avfilter_unref_buffer,libavfilter),Void,(Ptr{AVFilterBufferRef},),ref) + ccall((:avfilter_unref_buffer,libavfilter),Cvoid,(Ptr{AVFilterBufferRef},),ref) end function avfilter_unref_bufferp(ref) - ccall((:avfilter_unref_bufferp,libavfilter),Void,(Ptr{Ptr{AVFilterBufferRef}},),ref) + ccall((:avfilter_unref_bufferp,libavfilter),Cvoid,(Ptr{Ptr{AVFilterBufferRef}},),ref) end function avfilter_pad_count(pads) @@ -102,11 +102,11 @@ function avfilter_get_audio_buffer_ref_from_arrays(data,linesize::Integer,perms: end function avfilter_register_all() - ccall((:avfilter_register_all,libavfilter),Void,()) + ccall((:avfilter_register_all,libavfilter),Cvoid,()) end function avfilter_uninit() - ccall((:avfilter_uninit,libavfilter),Void,()) + ccall((:avfilter_uninit,libavfilter),Cvoid,()) end function avfilter_register(filter) @@ -130,7 +130,7 @@ function avfilter_open(filter_ctx,filter,inst_name) end function avfilter_init_filter(filter,args,opaque) - ccall((:avfilter_init_filter,libavfilter),Cint,(Ptr{AVFilterContext},Ptr{UInt8},Ptr{Void}),filter,args,opaque) + ccall((:avfilter_init_filter,libavfilter),Cint,(Ptr{AVFilterContext},Ptr{UInt8},Ptr{Cvoid}),filter,args,opaque) end function avfilter_init_str(ctx,args) @@ -142,7 +142,7 @@ function avfilter_init_dict(ctx,options) end function avfilter_free(filter) - ccall((:avfilter_free,libavfilter),Void,(Ptr{AVFilterContext},),filter) + ccall((:avfilter_free,libavfilter),Cvoid,(Ptr{AVFilterContext},),filter) end function avfilter_insert_filter(link,filt,filt_srcpad_idx::Integer,filt_dstpad_idx::Integer) @@ -178,15 +178,15 @@ function avfilter_graph_add_filter(graphctx,filter) end function avfilter_graph_create_filter(filt_ctx,filt,name,args,opaque,graph_ctx) - ccall((:avfilter_graph_create_filter,libavfilter),Cint,(Ptr{Ptr{AVFilterContext}},Ptr{AVFilter},Ptr{UInt8},Ptr{UInt8},Ptr{Void},Ptr{AVFilterGraph}),filt_ctx,filt,name,args,opaque,graph_ctx) + ccall((:avfilter_graph_create_filter,libavfilter),Cint,(Ptr{Ptr{AVFilterContext}},Ptr{AVFilter},Ptr{UInt8},Ptr{UInt8},Ptr{Cvoid},Ptr{AVFilterGraph}),filt_ctx,filt,name,args,opaque,graph_ctx) end function avfilter_graph_config(graphctx,log_ctx) - ccall((:avfilter_graph_config,libavfilter),Cint,(Ptr{AVFilterGraph},Ptr{Void}),graphctx,log_ctx) + ccall((:avfilter_graph_config,libavfilter),Cint,(Ptr{AVFilterGraph},Ptr{Cvoid}),graphctx,log_ctx) end function avfilter_graph_free(graph) - ccall((:avfilter_graph_free,libavfilter),Void,(Ptr{Ptr{AVFilterGraph}},),graph) + ccall((:avfilter_graph_free,libavfilter),Cvoid,(Ptr{Ptr{AVFilterGraph}},),graph) end function avfilter_inout_alloc() @@ -194,11 +194,11 @@ function avfilter_inout_alloc() end function avfilter_inout_free(inout) - ccall((:avfilter_inout_free,libavfilter),Void,(Ptr{Ptr{AVFilterInOut}},),inout) + ccall((:avfilter_inout_free,libavfilter),Cvoid,(Ptr{Ptr{AVFilterInOut}},),inout) end function avfilter_graph_parse(graph,filters,inputs,outputs,log_ctx) - ccall((:avfilter_graph_parse,libavfilter),Cint,(Ptr{AVFilterGraph},Ptr{UInt8},Ptr{AVFilterInOut},Ptr{AVFilterInOut},Ptr{Void}),graph,filters,inputs,outputs,log_ctx) + ccall((:avfilter_graph_parse,libavfilter),Cint,(Ptr{AVFilterGraph},Ptr{UInt8},Ptr{AVFilterInOut},Ptr{AVFilterInOut},Ptr{Cvoid}),graph,filters,inputs,outputs,log_ctx) end function avfilter_graph_parse2(graph,filters,inputs,outputs) diff --git a/src/libav/AVFilters/v4/libavfilter_h.jl b/src/libav/AVFilters/v4/libavfilter_h.jl index 24e521f4..69692584 100644 --- a/src/libav/AVFilters/v4/libavfilter_h.jl +++ b/src/libav/AVFilters/v4/libavfilter_h.jl @@ -44,7 +44,7 @@ const AVFILTER_THREAD_SLICE = 1 << 0 const AVFilterContext=AVFilterContext const AVFilterLink=AVFilterLink const AVFilterPad=AVFilterPad -const AVFilterFormats=Void +const AVFilterFormats=Nothing struct Array_8_Ptr d1::Ptr{UInt8} @@ -76,8 +76,8 @@ struct AVFilterBuffer data::Array_8_Ptr extended_data::Ptr{Ptr{UInt8}} linesize::Array_8_Cint - priv::Ptr{Void} - free::Ptr{Void} + priv::Ptr{Cvoid} + free::Ptr{Cvoid} format::Cint w::Cint h::Cint @@ -122,16 +122,16 @@ struct AVFilter outputs::Ptr{AVFilterPad} priv_class::Ptr{AVClass} flags::Cint - init::Ptr{Void} - init_dict::Ptr{Void} - uninit::Ptr{Void} - query_formats::Ptr{Void} + init::Ptr{Cvoid} + init_dict::Ptr{Cvoid} + uninit::Ptr{Cvoid} + query_formats::Ptr{Cvoid} priv_size::Cint next::Ptr{AVFilter} end -const AVFilterInternal=Void -const AVFilterGraphInternal=Void +const AVFilterInternal=Nothing +const AVFilterGraphInternal=Nothing struct AVFilterGraph av_class::Ptr{AVClass} @@ -143,7 +143,7 @@ struct AVFilterGraph thread_type::Cint nb_threads::Cint internal::Ptr{AVFilterGraphInternal} - opaque::Ptr{Void} + opaque::Ptr{Cvoid} execute::Ptr{avfilter_execute_func} end diff --git a/src/libav/AVFormat/v53/avformat.jl b/src/libav/AVFormat/v53/avformat.jl index 83d98a28..ab95823f 100644 --- a/src/libav/AVFormat/v53/avformat.jl +++ b/src/libav/AVFormat/v53/avformat.jl @@ -95,15 +95,15 @@ function av_metadata_set2(pm,key,value,flags::Integer) end function av_metadata_conv(ctx,d_conv,s_conv) - ccall((:av_metadata_conv,libavformat),Void,(Ptr{AVFormatContext},Ptr{AVMetadataConv},Ptr{AVMetadataConv}),ctx,d_conv,s_conv) + ccall((:av_metadata_conv,libavformat),Cvoid,(Ptr{AVFormatContext},Ptr{AVMetadataConv},Ptr{AVMetadataConv}),ctx,d_conv,s_conv) end function av_metadata_copy(dst,src,flags::Integer) - ccall((:av_metadata_copy,libavformat),Void,(Ptr{Ptr{AVDictionary}},Ptr{AVDictionary},Cint),dst,src,flags) + ccall((:av_metadata_copy,libavformat),Cvoid,(Ptr{Ptr{AVDictionary}},Ptr{AVDictionary},Cint),dst,src,flags) end function av_metadata_free(m) - ccall((:av_metadata_free,libavformat),Void,(Ptr{Ptr{AVDictionary}},),m) + ccall((:av_metadata_free,libavformat),Cvoid,(Ptr{Ptr{AVDictionary}},),m) end function av_get_packet(s,pkt,size::Integer) @@ -127,15 +127,15 @@ function avformat_license() end function av_register_all() - ccall((:av_register_all,libavformat),Void,()) + ccall((:av_register_all,libavformat),Cvoid,()) end function av_register_input_format(format) - ccall((:av_register_input_format,libavformat),Void,(Ptr{AVInputFormat},),format) + ccall((:av_register_input_format,libavformat),Cvoid,(Ptr{AVInputFormat},),format) end function av_register_output_format(format) - ccall((:av_register_output_format,libavformat),Void,(Ptr{AVOutputFormat},),format) + ccall((:av_register_output_format,libavformat),Cvoid,(Ptr{AVOutputFormat},),format) end function avformat_network_init() @@ -159,7 +159,7 @@ function avformat_alloc_context() end function avformat_free_context(s) - ccall((:avformat_free_context,libavformat),Void,(Ptr{AVFormatContext},),s) + ccall((:avformat_free_context,libavformat),Cvoid,(Ptr{AVFormatContext},),s) end function avformat_get_class() @@ -179,11 +179,11 @@ function av_guess_image2_codec(filename) end function av_pkt_dump(f,pkt,dump_payload::Integer) - ccall((:av_pkt_dump,libavformat),Void,(Ptr{Void},Ptr{AVPacket},Cint),f,pkt,dump_payload) + ccall((:av_pkt_dump,libavformat),Cvoid,(Ptr{Cvoid},Ptr{AVPacket},Cint),f,pkt,dump_payload) end function av_pkt_dump_log(avcl,level::Integer,pkt,dump_payload::Integer) - ccall((:av_pkt_dump_log,libavformat),Void,(Ptr{Void},Cint,Ptr{AVPacket},Cint),avcl,level,pkt,dump_payload) + ccall((:av_pkt_dump_log,libavformat),Cvoid,(Ptr{Cvoid},Cint,Ptr{AVPacket},Cint),avcl,level,pkt,dump_payload) end function av_find_input_format(short_name) @@ -199,7 +199,7 @@ function av_probe_input_format2(pd,is_opened::Integer,score_max) end function av_probe_input_buffer(pb,fmt,filename,logctx,offset::Integer,max_probe_size::Integer) - ccall((:av_probe_input_buffer,libavformat),Cint,(Ptr{AVIOContext},Ptr{Ptr{AVInputFormat}},Ptr{UInt8},Ptr{Void},UInt32,UInt32),pb,fmt,filename,logctx,offset,max_probe_size) + ccall((:av_probe_input_buffer,libavformat),Cint,(Ptr{AVIOContext},Ptr{Ptr{AVInputFormat}},Ptr{UInt8},Ptr{Cvoid},UInt32,UInt32),pb,fmt,filename,logctx,offset,max_probe_size) end # function av_open_input_stream(ic_ptr,pb,filename,fmt,ap) @@ -251,15 +251,15 @@ function av_read_pause(s) end function av_close_input_stream(s) - ccall((:av_close_input_stream,libavformat),Void,(Ptr{AVFormatContext},),s) + ccall((:av_close_input_stream,libavformat),Cvoid,(Ptr{AVFormatContext},),s) end function av_close_input_file(s) - ccall((:av_close_input_file,libavformat),Void,(Ptr{AVFormatContext},),s) + ccall((:av_close_input_file,libavformat),Cvoid,(Ptr{AVFormatContext},),s) end function avformat_close_input(s) - ccall((:avformat_close_input,libavformat),Void,(Ptr{Ptr{AVFormatContext}},),s) + ccall((:avformat_close_input,libavformat),Cvoid,(Ptr{Ptr{AVFormatContext}},),s) end function av_new_stream(s,id::Integer) @@ -267,7 +267,7 @@ function av_new_stream(s,id::Integer) end function av_set_pts_info(s,pts_wrap_bits::Integer,pts_num::Integer,pts_den::Integer) - ccall((:av_set_pts_info,libavformat),Void,(Ptr{AVStream},Cint,UInt32,UInt32),s,pts_wrap_bits,pts_num,pts_den) + ccall((:av_set_pts_info,libavformat),Cvoid,(Ptr{AVStream},Cint,UInt32,UInt32),s,pts_wrap_bits,pts_num,pts_den) end function av_seek_frame_binary(s,stream_index::Integer,target_ts::Int64,flags::Integer) @@ -275,11 +275,11 @@ function av_seek_frame_binary(s,stream_index::Integer,target_ts::Int64,flags::In end function av_update_cur_dts(s,ref_st,timestamp::Int64) - ccall((:av_update_cur_dts,libavformat),Void,(Ptr{AVFormatContext},Ptr{AVStream},Int64),s,ref_st,timestamp) + ccall((:av_update_cur_dts,libavformat),Cvoid,(Ptr{AVFormatContext},Ptr{AVStream},Int64),s,ref_st,timestamp) end function av_gen_search(s,stream_index::Integer,target_ts::Int64,pos_min::Int64,pos_max::Int64,pos_limit::Int64,ts_min::Int64,ts_max::Int64,flags::Integer,ts_ret,read_timestamp) - ccall((:av_gen_search,libavformat),Int64,(Ptr{AVFormatContext},Cint,Int64,Int64,Int64,Int64,Int64,Int64,Cint,Ptr{Int64},Ptr{Void}),s,stream_index,target_ts,pos_min,pos_max,pos_limit,ts_min,ts_max,flags,ts_ret,read_timestamp) + ccall((:av_gen_search,libavformat),Int64,(Ptr{AVFormatContext},Cint,Int64,Int64,Int64,Int64,Int64,Int64,Cint,Ptr{Int64},Ptr{Cvoid}),s,stream_index,target_ts,pos_min,pos_max,pos_limit,ts_min,ts_max,flags,ts_ret,read_timestamp) end function av_set_parameters(s,ap) @@ -319,19 +319,19 @@ function av_guess_codec(fmt,short_name,filename,mime_type,_type::AVMediaType) end function av_hex_dump(f,buf,size::Integer) - ccall((:av_hex_dump,libavformat),Void,(Ptr{Void},Ptr{UInt8},Cint),f,buf,size) + ccall((:av_hex_dump,libavformat),Cvoid,(Ptr{Cvoid},Ptr{UInt8},Cint),f,buf,size) end function av_hex_dump_log(avcl,level::Integer,buf,size::Integer) - ccall((:av_hex_dump_log,libavformat),Void,(Ptr{Void},Cint,Ptr{UInt8},Cint),avcl,level,buf,size) + ccall((:av_hex_dump_log,libavformat),Cvoid,(Ptr{Cvoid},Cint,Ptr{UInt8},Cint),avcl,level,buf,size) end function av_pkt_dump2(f,pkt,dump_payload::Integer,st) - ccall((:av_pkt_dump2,libavformat),Void,(Ptr{Void},Ptr{AVPacket},Cint,Ptr{AVStream}),f,pkt,dump_payload,st) + ccall((:av_pkt_dump2,libavformat),Cvoid,(Ptr{Cvoid},Ptr{AVPacket},Cint,Ptr{AVStream}),f,pkt,dump_payload,st) end function av_pkt_dump_log2(avcl,level::Integer,pkt,dump_payload::Integer,st) - ccall((:av_pkt_dump_log2,libavformat),Void,(Ptr{Void},Cint,Ptr{AVPacket},Cint,Ptr{AVStream}),avcl,level,pkt,dump_payload,st) + ccall((:av_pkt_dump_log2,libavformat),Cvoid,(Ptr{Cvoid},Cint,Ptr{AVPacket},Cint,Ptr{AVStream}),avcl,level,pkt,dump_payload,st) end function av_codec_get_id(tags,tag::Integer) @@ -355,15 +355,15 @@ function av_add_index_entry(st,pos::Int64,timestamp::Int64,size::Integer,distanc end function av_url_split(proto,proto_size::Integer,authorization,authorization_size::Integer,hostname,hostname_size::Integer,port_ptr,path,path_size::Integer,url) - ccall((:av_url_split,libavformat),Void,(Ptr{UInt8},Cint,Ptr{UInt8},Cint,Ptr{UInt8},Cint,Ptr{Cint},Ptr{UInt8},Cint,Ptr{UInt8}),proto,proto_size,authorization,authorization_size,hostname,hostname_size,port_ptr,path,path_size,url) + ccall((:av_url_split,libavformat),Cvoid,(Ptr{UInt8},Cint,Ptr{UInt8},Cint,Ptr{UInt8},Cint,Ptr{Cint},Ptr{UInt8},Cint,Ptr{UInt8}),proto,proto_size,authorization,authorization_size,hostname,hostname_size,port_ptr,path,path_size,url) end function dump_format(ic,index::Integer,url,is_output::Integer) - ccall((:dump_format,libavformat),Void,(Ptr{AVFormatContext},Cint,Ptr{UInt8},Cint),ic,index,url,is_output) + ccall((:dump_format,libavformat),Cvoid,(Ptr{AVFormatContext},Cint,Ptr{UInt8},Cint),ic,index,url,is_output) end function av_dump_format(ic,index::Integer,url,is_output::Integer) - ccall((:av_dump_format,libavformat),Void,(Ptr{AVFormatContext},Cint,Ptr{UInt8},Cint),ic,index,url,is_output) + ccall((:av_dump_format,libavformat),Cvoid,(Ptr{AVFormatContext},Cint,Ptr{UInt8},Cint),ic,index,url,is_output) end function parse_date(datestr,duration::Integer) diff --git a/src/libav/AVFormat/v53/avio.jl b/src/libav/AVFormat/v53/avio.jl index 940df577..fadeb0ea 100644 --- a/src/libav/AVFormat/v53/avio.jl +++ b/src/libav/AVFormat/v53/avio.jl @@ -173,7 +173,7 @@ function url_get_max_packet_size(h) end function url_get_filename(h,buf,buf_size::Integer) - ccall((:url_get_filename,libavformat),Void,(Ptr{URLContext},Ptr{UInt8},Cint),h,buf,buf_size) + ccall((:url_get_filename,libavformat),Cvoid,(Ptr{URLContext},Ptr{UInt8},Cint),h,buf,buf_size) end function av_url_read_pause(h,pause::Integer) @@ -185,7 +185,7 @@ function av_url_read_seek(h,stream_index::Integer,timestamp::Int64,flags::Intege end function url_set_interrupt_cb(interrupt_cb) - ccall((:url_set_interrupt_cb,libavformat),Void,(Ptr{Void},),interrupt_cb) + ccall((:url_set_interrupt_cb,libavformat),Cvoid,(Ptr{Cvoid},),interrupt_cb) end function av_protocol_next(p) @@ -197,11 +197,11 @@ function av_register_protocol2(protocol,size::Integer) end function init_put_byte(s,buffer,buffer_size::Integer,write_flag::Integer,opaque,read_packet,write_packet,seek) - ccall((:init_put_byte,libavformat),Cint,(Ptr{AVIOContext},Ptr{Cuchar},Cint,Cint,Ptr{Void},Ptr{Void},Ptr{Void},Ptr{Void}),s,buffer,buffer_size,write_flag,opaque,read_packet,write_packet,seek) + ccall((:init_put_byte,libavformat),Cint,(Ptr{AVIOContext},Ptr{Cuchar},Cint,Cint,Ptr{Cvoid},Ptr{Cvoid},Ptr{Cvoid},Ptr{Cvoid}),s,buffer,buffer_size,write_flag,opaque,read_packet,write_packet,seek) end function av_alloc_put_byte(buffer,buffer_size::Integer,write_flag::Integer,opaque,read_packet,write_packet,seek) - ccall((:av_alloc_put_byte,libavformat),Ptr{AVIOContext},(Ptr{Cuchar},Cint,Cint,Ptr{Void},Ptr{Void},Ptr{Void},Ptr{Void}),buffer,buffer_size,write_flag,opaque,read_packet,write_packet,seek) + ccall((:av_alloc_put_byte,libavformat),Ptr{AVIOContext},(Ptr{Cuchar},Cint,Cint,Ptr{Cvoid},Ptr{Cvoid},Ptr{Cvoid},Ptr{Cvoid}),buffer,buffer_size,write_flag,opaque,read_packet,write_packet,seek) end function get_buffer(s,buf,size::Integer) @@ -249,51 +249,51 @@ function get_be64(s) end function put_byte(s,b::Integer) - ccall((:put_byte,libavformat),Void,(Ptr{AVIOContext},Cint),s,b) + ccall((:put_byte,libavformat),Cvoid,(Ptr{AVIOContext},Cint),s,b) end function put_nbyte(s,b::Integer,count::Integer) - ccall((:put_nbyte,libavformat),Void,(Ptr{AVIOContext},Cint,Cint),s,b,count) + ccall((:put_nbyte,libavformat),Cvoid,(Ptr{AVIOContext},Cint,Cint),s,b,count) end function put_buffer(s,buf,size::Integer) - ccall((:put_buffer,libavformat),Void,(Ptr{AVIOContext},Ptr{Cuchar},Cint),s,buf,size) + ccall((:put_buffer,libavformat),Cvoid,(Ptr{AVIOContext},Ptr{Cuchar},Cint),s,buf,size) end function put_le64(s,val::UInt64) - ccall((:put_le64,libavformat),Void,(Ptr{AVIOContext},UInt64),s,val) + ccall((:put_le64,libavformat),Cvoid,(Ptr{AVIOContext},UInt64),s,val) end function put_be64(s,val::UInt64) - ccall((:put_be64,libavformat),Void,(Ptr{AVIOContext},UInt64),s,val) + ccall((:put_be64,libavformat),Cvoid,(Ptr{AVIOContext},UInt64),s,val) end function put_le32(s,val::Integer) - ccall((:put_le32,libavformat),Void,(Ptr{AVIOContext},UInt32),s,val) + ccall((:put_le32,libavformat),Cvoid,(Ptr{AVIOContext},UInt32),s,val) end function put_be32(s,val::Integer) - ccall((:put_be32,libavformat),Void,(Ptr{AVIOContext},UInt32),s,val) + ccall((:put_be32,libavformat),Cvoid,(Ptr{AVIOContext},UInt32),s,val) end function put_le24(s,val::Integer) - ccall((:put_le24,libavformat),Void,(Ptr{AVIOContext},UInt32),s,val) + ccall((:put_le24,libavformat),Cvoid,(Ptr{AVIOContext},UInt32),s,val) end function put_be24(s,val::Integer) - ccall((:put_be24,libavformat),Void,(Ptr{AVIOContext},UInt32),s,val) + ccall((:put_be24,libavformat),Cvoid,(Ptr{AVIOContext},UInt32),s,val) end function put_le16(s,val::Integer) - ccall((:put_le16,libavformat),Void,(Ptr{AVIOContext},UInt32),s,val) + ccall((:put_le16,libavformat),Cvoid,(Ptr{AVIOContext},UInt32),s,val) end function put_be16(s,val::Integer) - ccall((:put_be16,libavformat),Void,(Ptr{AVIOContext},UInt32),s,val) + ccall((:put_be16,libavformat),Cvoid,(Ptr{AVIOContext},UInt32),s,val) end function put_tag(s,tag) - ccall((:put_tag,libavformat),Void,(Ptr{AVIOContext},Ptr{UInt8}),s,tag) + ccall((:put_tag,libavformat),Cvoid,(Ptr{AVIOContext},Ptr{UInt8}),s,tag) end function av_url_read_fpause(h,pause::Integer) @@ -337,7 +337,7 @@ function url_setbufsize(s,buf_size::Integer) end function put_flush_packet(s) - ccall((:put_flush_packet,libavformat),Void,(Ptr{AVIOContext},),s) + ccall((:put_flush_packet,libavformat),Cvoid,(Ptr{AVIOContext},),s) end function url_open_dyn_buf(s) @@ -373,7 +373,7 @@ function udp_get_local_port(h) end function init_checksum(s,update_checksum,checksum::Culong) - ccall((:init_checksum,libavformat),Void,(Ptr{AVIOContext},Ptr{Void},Culong),s,update_checksum,checksum) + ccall((:init_checksum,libavformat),Cvoid,(Ptr{AVIOContext},Ptr{Cvoid},Culong),s,update_checksum,checksum) end function get_checksum(s) @@ -381,7 +381,7 @@ function get_checksum(s) end function put_strz(s,buf) - ccall((:put_strz,libavformat),Void,(Ptr{AVIOContext},Ptr{UInt8}),s,buf) + ccall((:put_strz,libavformat),Cvoid,(Ptr{AVIOContext},Ptr{UInt8}),s,buf) end function url_fgets(s,buf,buf_size::Integer) @@ -421,51 +421,51 @@ function avio_check(url,flags::Integer) end function avio_set_interrupt_cb(interrupt_cb) - ccall((:avio_set_interrupt_cb,libavformat),Void,(Ptr{Void},),interrupt_cb) + ccall((:avio_set_interrupt_cb,libavformat),Cvoid,(Ptr{Cvoid},),interrupt_cb) end function avio_alloc_context(buffer,buffer_size::Integer,write_flag::Integer,opaque,read_packet,write_packet,seek) - ccall((:avio_alloc_context,libavformat),Ptr{AVIOContext},(Ptr{Cuchar},Cint,Cint,Ptr{Void},Ptr{Void},Ptr{Void},Ptr{Void}),buffer,buffer_size,write_flag,opaque,read_packet,write_packet,seek) + ccall((:avio_alloc_context,libavformat),Ptr{AVIOContext},(Ptr{Cuchar},Cint,Cint,Ptr{Cvoid},Ptr{Cvoid},Ptr{Cvoid},Ptr{Cvoid}),buffer,buffer_size,write_flag,opaque,read_packet,write_packet,seek) end function avio_w8(s,b::Integer) - ccall((:avio_w8,libavformat),Void,(Ptr{AVIOContext},Cint),s,b) + ccall((:avio_w8,libavformat),Cvoid,(Ptr{AVIOContext},Cint),s,b) end function avio_write(s,buf,size::Integer) - ccall((:avio_write,libavformat),Void,(Ptr{AVIOContext},Ptr{Cuchar},Cint),s,buf,size) + ccall((:avio_write,libavformat),Cvoid,(Ptr{AVIOContext},Ptr{Cuchar},Cint),s,buf,size) end function avio_wl64(s,val::UInt64) - ccall((:avio_wl64,libavformat),Void,(Ptr{AVIOContext},UInt64),s,val) + ccall((:avio_wl64,libavformat),Cvoid,(Ptr{AVIOContext},UInt64),s,val) end function avio_wb64(s,val::UInt64) - ccall((:avio_wb64,libavformat),Void,(Ptr{AVIOContext},UInt64),s,val) + ccall((:avio_wb64,libavformat),Cvoid,(Ptr{AVIOContext},UInt64),s,val) end function avio_wl32(s,val::Integer) - ccall((:avio_wl32,libavformat),Void,(Ptr{AVIOContext},UInt32),s,val) + ccall((:avio_wl32,libavformat),Cvoid,(Ptr{AVIOContext},UInt32),s,val) end function avio_wb32(s,val::Integer) - ccall((:avio_wb32,libavformat),Void,(Ptr{AVIOContext},UInt32),s,val) + ccall((:avio_wb32,libavformat),Cvoid,(Ptr{AVIOContext},UInt32),s,val) end function avio_wl24(s,val::Integer) - ccall((:avio_wl24,libavformat),Void,(Ptr{AVIOContext},UInt32),s,val) + ccall((:avio_wl24,libavformat),Cvoid,(Ptr{AVIOContext},UInt32),s,val) end function avio_wb24(s,val::Integer) - ccall((:avio_wb24,libavformat),Void,(Ptr{AVIOContext},UInt32),s,val) + ccall((:avio_wb24,libavformat),Cvoid,(Ptr{AVIOContext},UInt32),s,val) end function avio_wl16(s,val::Integer) - ccall((:avio_wl16,libavformat),Void,(Ptr{AVIOContext},UInt32),s,val) + ccall((:avio_wl16,libavformat),Cvoid,(Ptr{AVIOContext},UInt32),s,val) end function avio_wb16(s,val::Integer) - ccall((:avio_wb16,libavformat),Void,(Ptr{AVIOContext},UInt32),s,val) + ccall((:avio_wb16,libavformat),Cvoid,(Ptr{AVIOContext},UInt32),s,val) end function avio_put_str(s,str) @@ -493,7 +493,7 @@ function avio_size(s) end function avio_flush(s) - ccall((:avio_flush,libavformat),Void,(Ptr{AVIOContext},),s) + ccall((:avio_flush,libavformat),Cvoid,(Ptr{AVIOContext},),s) end function avio_read(s,buf,size::Integer) @@ -569,7 +569,7 @@ function avio_close_dyn_buf(s,pbuffer) end function avio_enum_protocols(opaque,output::Integer) - ccall((:avio_enum_protocols,libavformat),Ptr{UInt8},(Ptr{Ptr{Void}},Cint),opaque,output) + ccall((:avio_enum_protocols,libavformat),Ptr{UInt8},(Ptr{Ptr{Cvoid}},Cint),opaque,output) end function avio_pause(h,pause::Integer) diff --git a/src/libav/AVFormat/v53/libavformat_h.jl b/src/libav/AVFormat/v53/libavformat_h.jl index 752f9dc0..64346142 100644 --- a/src/libav/AVFormat/v53/libavformat_h.jl +++ b/src/libav/AVFormat/v53/libavformat_h.jl @@ -117,8 +117,8 @@ const AVIO_FLAG_READ_WRITE = AVIO_FLAG_READ | AVIO_FLAG_WRITE const AVIO_FLAG_NONBLOCK = 8 struct AVIOInterruptCB - callback::Ptr{Void} - opaque::Ptr{Void} + callback::Ptr{Cvoid} + opaque::Ptr{Cvoid} end struct AVIOContext @@ -126,10 +126,10 @@ struct AVIOContext buffer_size::Cint buf_ptr::Ptr{Cuchar} buf_end::Ptr{Cuchar} - opaque::Ptr{Void} - read_packet::Ptr{Void} - write_packet::Ptr{Void} - seek::Ptr{Void} + opaque::Ptr{Cvoid} + read_packet::Ptr{Cvoid} + write_packet::Ptr{Cvoid} + seek::Ptr{Cvoid} pos::Int64 must_flush::Cint eof_reached::Cint @@ -138,28 +138,28 @@ struct AVIOContext max_packet_size::Cint checksum::Culong checksum_ptr::Ptr{Cuchar} - update_checksum::Ptr{Void} + update_checksum::Ptr{Cvoid} error::Cint - read_pause::Ptr{Void} - read_seek::Ptr{Void} + read_pause::Ptr{Cvoid} + read_seek::Ptr{Cvoid} seekable::Cint end struct URLProtocol name::Ptr{UInt8} - url_open::Ptr{Void} - url_read::Ptr{Void} - url_write::Ptr{Void} - url_seek::Ptr{Void} - url_close::Ptr{Void} + url_open::Ptr{Cvoid} + url_read::Ptr{Cvoid} + url_write::Ptr{Cvoid} + url_seek::Ptr{Cvoid} + url_close::Ptr{Cvoid} next::Ptr{URLProtocol} - url_read_pause::Ptr{Void} - url_read_seek::Ptr{Void} - url_get_file_handle::Ptr{Void} + url_read_pause::Ptr{Cvoid} + url_read_seek::Ptr{Cvoid} + url_get_file_handle::Ptr{Cvoid} priv_data_size::Cint priv_data_class::Ptr{AVClass} flags::Cint - url_check::Ptr{Void} + url_check::Ptr{Cvoid} end struct URLContext @@ -168,7 +168,7 @@ struct URLContext flags::Cint is_streamed::Cint max_packet_size::Cint - priv_data::Ptr{Void} + priv_data::Ptr{Cvoid} filename::Ptr{UInt8} is_connected::Cint interrupt_callback::AVIOInterruptCB @@ -237,26 +237,26 @@ const AVSEEK_FLAG_BYTE = 2 const AVSEEK_FLAG_ANY = 4 const AVSEEK_FLAG_FRAME = 8 -const AVCodecTag=Void -const AVMetadataConv=Void +const AVCodecTag=Nothing +const AVMetadataConv=Nothing struct AVInputFormat name::Ptr{UInt8} long_name::Ptr{UInt8} priv_data_size::Cint - read_probe::Ptr{Void} - read_header::Ptr{Void} - read_packet::Ptr{Void} - read_close::Ptr{Void} - read_seek::Ptr{Void} - read_timestamp::Ptr{Void} + read_probe::Ptr{Cvoid} + read_header::Ptr{Cvoid} + read_packet::Ptr{Cvoid} + read_close::Ptr{Cvoid} + read_seek::Ptr{Cvoid} + read_timestamp::Ptr{Cvoid} flags::Cint extensions::Ptr{UInt8} value::Cint - read_play::Ptr{Void} - read_pause::Ptr{Void} + read_play::Ptr{Cvoid} + read_pause::Ptr{Cvoid} codec_tag::Ptr{Ptr{AVCodecTag}} - read_seek2::Ptr{Void} + read_seek2::Ptr{Cvoid} metadata_conv::Ptr{AVMetadataConv} priv_class::Ptr{AVClass} next::Ptr{AVInputFormat} @@ -270,17 +270,17 @@ struct AVOutputFormat priv_data_size::Cint audio_codec::CodecID video_codec::CodecID - write_header::Ptr{Void} - write_packet::Ptr{Void} - write_trailer::Ptr{Void} + write_header::Ptr{Cvoid} + write_packet::Ptr{Cvoid} + write_trailer::Ptr{Cvoid} flags::Cint - set_parameters::Ptr{Void} - interleave_packet::Ptr{Void} + set_parameters::Ptr{Cvoid} + interleave_packet::Ptr{Cvoid} codec_tag::Ptr{Ptr{AVCodecTag}} subtitle_codec::CodecID metadata_conv::Ptr{AVMetadataConv} priv_class::Ptr{AVClass} - query_codec::Ptr{Void} + query_codec::Ptr{Cvoid} next::Ptr{AVOutputFormat} end @@ -345,7 +345,7 @@ struct AVStream id::Cint codec::Ptr{AVCodecContext} r_frame_rate::AVRational - priv_data::Ptr{Void} + priv_data::Ptr{Cvoid} first_dts::Int64 pts::AVFrac time_base::AVRational @@ -377,7 +377,7 @@ struct AVStream last_in_packet_buffer::Ptr{AVPacketList} avg_frame_rate::AVRational codec_info_nb_frames::Cint - info::Ptr{Void} + info::Ptr{Cvoid} end struct Array_1024_Uint8 @@ -1430,7 +1430,7 @@ struct AVFormatContext av_class::Ptr{AVClass} iformat::Ptr{AVInputFormat} oformat::Ptr{AVOutputFormat} - priv_data::Ptr{Void} + priv_data::Ptr{Cvoid} pb::Ptr{AVIOContext} nb_streams::UInt32 streams::Ptr{Ptr{AVStream}} diff --git a/src/libav/AVFormat/v54/avformat.jl b/src/libav/AVFormat/v54/avformat.jl index 9807bb9b..d43bc6c5 100644 --- a/src/libav/AVFormat/v54/avformat.jl +++ b/src/libav/AVFormat/v54/avformat.jl @@ -83,15 +83,15 @@ function avformat_license() end function av_register_all() - ccall((:av_register_all,libavformat),Void,()) + ccall((:av_register_all,libavformat),Cvoid,()) end function av_register_input_format(format) - ccall((:av_register_input_format,libavformat),Void,(Ptr{AVInputFormat},),format) + ccall((:av_register_input_format,libavformat),Cvoid,(Ptr{AVInputFormat},),format) end function av_register_output_format(format) - ccall((:av_register_output_format,libavformat),Void,(Ptr{AVOutputFormat},),format) + ccall((:av_register_output_format,libavformat),Cvoid,(Ptr{AVOutputFormat},),format) end function avformat_network_init() @@ -115,7 +115,7 @@ function avformat_alloc_context() end function avformat_free_context(s) - ccall((:avformat_free_context,libavformat),Void,(Ptr{AVFormatContext},),s) + ccall((:avformat_free_context,libavformat),Cvoid,(Ptr{AVFormatContext},),s) end function avformat_get_class() @@ -143,7 +143,7 @@ function av_probe_input_format2(pd,is_opened::Integer,score_max) end function av_probe_input_buffer(pb,fmt,filename,logctx,offset::Integer,max_probe_size::Integer) - ccall((:av_probe_input_buffer,libavformat),Cint,(Ptr{AVIOContext},Ptr{Ptr{AVInputFormat}},Ptr{UInt8},Ptr{Void},UInt32,UInt32),pb,fmt,filename,logctx,offset,max_probe_size) + ccall((:av_probe_input_buffer,libavformat),Cint,(Ptr{AVIOContext},Ptr{Ptr{AVInputFormat}},Ptr{UInt8},Ptr{Cvoid},UInt32,UInt32),pb,fmt,filename,logctx,offset,max_probe_size) end function avformat_open_input(ps,filename,fmt,options) @@ -183,11 +183,11 @@ function av_read_pause(s) end function av_close_input_file(s) - ccall((:av_close_input_file,libavformat),Void,(Ptr{AVFormatContext},),s) + ccall((:av_close_input_file,libavformat),Cvoid,(Ptr{AVFormatContext},),s) end function avformat_close_input(s) - ccall((:avformat_close_input,libavformat),Void,(Ptr{Ptr{AVFormatContext}},),s) + ccall((:avformat_close_input,libavformat),Cvoid,(Ptr{Ptr{AVFormatContext}},),s) end function avformat_write_header(s,options) @@ -219,19 +219,19 @@ function av_guess_codec(fmt,short_name,filename,mime_type,_type::AVMediaType) end function av_hex_dump(f,buf,size::Integer) - ccall((:av_hex_dump,libavformat),Void,(Ptr{Void},Ptr{UInt8},Cint),f,buf,size) + ccall((:av_hex_dump,libavformat),Cvoid,(Ptr{Cvoid},Ptr{UInt8},Cint),f,buf,size) end function av_hex_dump_log(avcl,level::Integer,buf,size::Integer) - ccall((:av_hex_dump_log,libavformat),Void,(Ptr{Void},Cint,Ptr{UInt8},Cint),avcl,level,buf,size) + ccall((:av_hex_dump_log,libavformat),Cvoid,(Ptr{Cvoid},Cint,Ptr{UInt8},Cint),avcl,level,buf,size) end function av_pkt_dump2(f,pkt,dump_payload::Integer,st) - ccall((:av_pkt_dump2,libavformat),Void,(Ptr{Void},Ptr{AVPacket},Cint,Ptr{AVStream}),f,pkt,dump_payload,st) + ccall((:av_pkt_dump2,libavformat),Cvoid,(Ptr{Cvoid},Ptr{AVPacket},Cint,Ptr{AVStream}),f,pkt,dump_payload,st) end function av_pkt_dump_log2(avcl,level::Integer,pkt,dump_payload::Integer,st) - ccall((:av_pkt_dump_log2,libavformat),Void,(Ptr{Void},Cint,Ptr{AVPacket},Cint,Ptr{AVStream}),avcl,level,pkt,dump_payload,st) + ccall((:av_pkt_dump_log2,libavformat),Cvoid,(Ptr{Cvoid},Cint,Ptr{AVPacket},Cint,Ptr{AVStream}),avcl,level,pkt,dump_payload,st) end function av_codec_get_id(tags,tag::Integer) @@ -255,11 +255,11 @@ function av_add_index_entry(st,pos::Int64,timestamp::Int64,size::Integer,distanc end function av_url_split(proto,proto_size::Integer,authorization,authorization_size::Integer,hostname,hostname_size::Integer,port_ptr,path,path_size::Integer,url) - ccall((:av_url_split,libavformat),Void,(Ptr{UInt8},Cint,Ptr{UInt8},Cint,Ptr{UInt8},Cint,Ptr{Cint},Ptr{UInt8},Cint,Ptr{UInt8}),proto,proto_size,authorization,authorization_size,hostname,hostname_size,port_ptr,path,path_size,url) + ccall((:av_url_split,libavformat),Cvoid,(Ptr{UInt8},Cint,Ptr{UInt8},Cint,Ptr{UInt8},Cint,Ptr{Cint},Ptr{UInt8},Cint,Ptr{UInt8}),proto,proto_size,authorization,authorization_size,hostname,hostname_size,port_ptr,path,path_size,url) end function av_dump_format(ic,index::Integer,url,is_output::Integer) - ccall((:av_dump_format,libavformat),Void,(Ptr{AVFormatContext},Cint,Ptr{UInt8},Cint),ic,index,url,is_output) + ccall((:av_dump_format,libavformat),Cvoid,(Ptr{AVFormatContext},Cint,Ptr{UInt8},Cint),ic,index,url,is_output) end function av_get_frame_filename(buf,buf_size::Integer,path,number::Integer) diff --git a/src/libav/AVFormat/v54/avio.jl b/src/libav/AVFormat/v54/avio.jl index 6f8336f9..530ae46e 100644 --- a/src/libav/AVFormat/v54/avio.jl +++ b/src/libav/AVFormat/v54/avio.jl @@ -51,47 +51,47 @@ function avio_check(url,flags::Integer) end function avio_alloc_context(buffer,buffer_size::Integer,write_flag::Integer,opaque,read_packet,write_packet,seek) - ccall((:avio_alloc_context,libavformat),Ptr{AVIOContext},(Ptr{Cuchar},Cint,Cint,Ptr{Void},Ptr{Void},Ptr{Void},Ptr{Void}),buffer,buffer_size,write_flag,opaque,read_packet,write_packet,seek) + ccall((:avio_alloc_context,libavformat),Ptr{AVIOContext},(Ptr{Cuchar},Cint,Cint,Ptr{Cvoid},Ptr{Cvoid},Ptr{Cvoid},Ptr{Cvoid}),buffer,buffer_size,write_flag,opaque,read_packet,write_packet,seek) end function avio_w8(s,b::Integer) - ccall((:avio_w8,libavformat),Void,(Ptr{AVIOContext},Cint),s,b) + ccall((:avio_w8,libavformat),Cvoid,(Ptr{AVIOContext},Cint),s,b) end function avio_write(s,buf,size::Integer) - ccall((:avio_write,libavformat),Void,(Ptr{AVIOContext},Ptr{Cuchar},Cint),s,buf,size) + ccall((:avio_write,libavformat),Cvoid,(Ptr{AVIOContext},Ptr{Cuchar},Cint),s,buf,size) end function avio_wl64(s,val::UInt64) - ccall((:avio_wl64,libavformat),Void,(Ptr{AVIOContext},UInt64),s,val) + ccall((:avio_wl64,libavformat),Cvoid,(Ptr{AVIOContext},UInt64),s,val) end function avio_wb64(s,val::UInt64) - ccall((:avio_wb64,libavformat),Void,(Ptr{AVIOContext},UInt64),s,val) + ccall((:avio_wb64,libavformat),Cvoid,(Ptr{AVIOContext},UInt64),s,val) end function avio_wl32(s,val::Integer) - ccall((:avio_wl32,libavformat),Void,(Ptr{AVIOContext},UInt32),s,val) + ccall((:avio_wl32,libavformat),Cvoid,(Ptr{AVIOContext},UInt32),s,val) end function avio_wb32(s,val::Integer) - ccall((:avio_wb32,libavformat),Void,(Ptr{AVIOContext},UInt32),s,val) + ccall((:avio_wb32,libavformat),Cvoid,(Ptr{AVIOContext},UInt32),s,val) end function avio_wl24(s,val::Integer) - ccall((:avio_wl24,libavformat),Void,(Ptr{AVIOContext},UInt32),s,val) + ccall((:avio_wl24,libavformat),Cvoid,(Ptr{AVIOContext},UInt32),s,val) end function avio_wb24(s,val::Integer) - ccall((:avio_wb24,libavformat),Void,(Ptr{AVIOContext},UInt32),s,val) + ccall((:avio_wb24,libavformat),Cvoid,(Ptr{AVIOContext},UInt32),s,val) end function avio_wl16(s,val::Integer) - ccall((:avio_wl16,libavformat),Void,(Ptr{AVIOContext},UInt32),s,val) + ccall((:avio_wl16,libavformat),Cvoid,(Ptr{AVIOContext},UInt32),s,val) end function avio_wb16(s,val::Integer) - ccall((:avio_wb16,libavformat),Void,(Ptr{AVIOContext},UInt32),s,val) + ccall((:avio_wb16,libavformat),Cvoid,(Ptr{AVIOContext},UInt32),s,val) end function avio_put_str(s,str) @@ -119,7 +119,7 @@ function avio_size(s) end function avio_flush(s) - ccall((:avio_flush,libavformat),Void,(Ptr{AVIOContext},),s) + ccall((:avio_flush,libavformat),Cvoid,(Ptr{AVIOContext},),s) end function avio_read(s,buf,size::Integer) @@ -199,7 +199,7 @@ function avio_close_dyn_buf(s,pbuffer) end function avio_enum_protocols(opaque,output::Integer) - ccall((:avio_enum_protocols,libavformat),Ptr{UInt8},(Ptr{Ptr{Void}},Cint),opaque,output) + ccall((:avio_enum_protocols,libavformat),Ptr{UInt8},(Ptr{Ptr{Cvoid}},Cint),opaque,output) end function avio_pause(h,pause::Integer) diff --git a/src/libav/AVFormat/v54/libavformat_h.jl b/src/libav/AVFormat/v54/libavformat_h.jl index a1bd3383..ebe4328b 100644 --- a/src/libav/AVFormat/v54/libavformat_h.jl +++ b/src/libav/AVFormat/v54/libavformat_h.jl @@ -91,8 +91,8 @@ const AVIO_FLAG_READ_WRITE = AVIO_FLAG_READ | AVIO_FLAG_WRITE const AVIO_FLAG_NONBLOCK = 8 struct AVIOInterruptCB - callback::Ptr{Void} - opaque::Ptr{Void} + callback::Ptr{Cvoid} + opaque::Ptr{Cvoid} end struct AVIOContext @@ -101,10 +101,10 @@ struct AVIOContext buffer_size::Cint buf_ptr::Ptr{Cuchar} buf_end::Ptr{Cuchar} - opaque::Ptr{Void} - read_packet::Ptr{Void} - write_packet::Ptr{Void} - seek::Ptr{Void} + opaque::Ptr{Cvoid} + read_packet::Ptr{Cvoid} + write_packet::Ptr{Cvoid} + seek::Ptr{Cvoid} pos::Int64 must_flush::Cint eof_reached::Cint @@ -112,10 +112,10 @@ struct AVIOContext max_packet_size::Cint checksum::Culong checksum_ptr::Ptr{Cuchar} - update_checksum::Ptr{Void} + update_checksum::Ptr{Cvoid} error::Cint - read_pause::Ptr{Void} - read_seek::Ptr{Void} + read_pause::Ptr{Cvoid} + read_seek::Ptr{Cvoid} seekable::Cint end @@ -170,7 +170,7 @@ const AVSEEK_FLAG_BYTE = 2 const AVSEEK_FLAG_ANY = 4 const AVSEEK_FLAG_FRAME = 8 -const AVCodecTag=Void +const AVCodecTag=Nothing struct AVInputFormat name::Ptr{UInt8} @@ -182,15 +182,15 @@ struct AVInputFormat next::Ptr{AVInputFormat} raw_codec_id::Cint priv_data_size::Cint - read_probe::Ptr{Void} - read_header::Ptr{Void} - read_packet::Ptr{Void} - read_close::Ptr{Void} - read_seek::Ptr{Void} - read_timestamp::Ptr{Void} - read_play::Ptr{Void} - read_pause::Ptr{Void} - read_seek2::Ptr{Void} + read_probe::Ptr{Cvoid} + read_header::Ptr{Cvoid} + read_packet::Ptr{Cvoid} + read_close::Ptr{Cvoid} + read_seek::Ptr{Cvoid} + read_timestamp::Ptr{Cvoid} + read_play::Ptr{Cvoid} + read_pause::Ptr{Cvoid} + read_seek2::Ptr{Cvoid} end struct AVOutputFormat @@ -206,11 +206,11 @@ struct AVOutputFormat priv_class::Ptr{AVClass} next::Ptr{AVOutputFormat} priv_data_size::Cint - write_header::Ptr{Void} - write_packet::Ptr{Void} - write_trailer::Ptr{Void} - interleave_packet::Ptr{Void} - query_codec::Ptr{Void} + write_header::Ptr{Cvoid} + write_packet::Ptr{Cvoid} + write_trailer::Ptr{Cvoid} + interleave_packet::Ptr{Cvoid} + query_codec::Ptr{Cvoid} end struct AVFrac @@ -274,7 +274,7 @@ struct AVStream id::Cint codec::Ptr{AVCodecContext} r_frame_rate::AVRational - priv_data::Ptr{Void} + priv_data::Ptr{Cvoid} pts::AVFrac time_base::AVRational start_time::Int64 @@ -286,7 +286,7 @@ struct AVStream metadata::Ptr{AVDictionary} avg_frame_rate::AVRational attached_pic::AVPacket - info::Ptr{Void} + info::Ptr{Cvoid} pts_wrap_bits::Cint reference_dts::Int64 first_dts::Int64 @@ -1355,7 +1355,7 @@ struct AVFormatContext av_class::Ptr{AVClass} iformat::Ptr{AVInputFormat} oformat::Ptr{AVOutputFormat} - priv_data::Ptr{Void} + priv_data::Ptr{Cvoid} pb::Ptr{AVIOContext} ctx_flags::Cint nb_streams::UInt32 diff --git a/src/libav/AVFormat/v55/avformat.jl b/src/libav/AVFormat/v55/avformat.jl index b8f1675c..f11dec91 100644 --- a/src/libav/AVFormat/v55/avformat.jl +++ b/src/libav/AVFormat/v55/avformat.jl @@ -80,15 +80,15 @@ function avformat_license() end function av_register_all() - ccall((:av_register_all,libavformat),Void,()) + ccall((:av_register_all,libavformat),Cvoid,()) end function av_register_input_format(format) - ccall((:av_register_input_format,libavformat),Void,(Ptr{AVInputFormat},),format) + ccall((:av_register_input_format,libavformat),Cvoid,(Ptr{AVInputFormat},),format) end function av_register_output_format(format) - ccall((:av_register_output_format,libavformat),Void,(Ptr{AVOutputFormat},),format) + ccall((:av_register_output_format,libavformat),Cvoid,(Ptr{AVOutputFormat},),format) end function avformat_network_init() @@ -112,7 +112,7 @@ function avformat_alloc_context() end function avformat_free_context(s) - ccall((:avformat_free_context,libavformat),Void,(Ptr{AVFormatContext},),s) + ccall((:avformat_free_context,libavformat),Cvoid,(Ptr{AVFormatContext},),s) end function avformat_get_class() @@ -140,7 +140,7 @@ function av_probe_input_format2(pd,is_opened::Integer,score_max) end function av_probe_input_buffer(pb,fmt,filename,logctx,offset::Integer,max_probe_size::Integer) - ccall((:av_probe_input_buffer,libavformat),Cint,(Ptr{AVIOContext},Ptr{Ptr{AVInputFormat}},Ptr{UInt8},Ptr{Void},UInt32,UInt32),pb,fmt,filename,logctx,offset,max_probe_size) + ccall((:av_probe_input_buffer,libavformat),Cint,(Ptr{AVIOContext},Ptr{Ptr{AVInputFormat}},Ptr{UInt8},Ptr{Cvoid},UInt32,UInt32),pb,fmt,filename,logctx,offset,max_probe_size) end function avformat_open_input(ps,filename,fmt,options) @@ -176,7 +176,7 @@ function av_read_pause(s) end function avformat_close_input(s) - ccall((:avformat_close_input,libavformat),Void,(Ptr{Ptr{AVFormatContext}},),s) + ccall((:avformat_close_input,libavformat),Cvoid,(Ptr{Ptr{AVFormatContext}},),s) end function avformat_write_header(s,options) @@ -204,19 +204,19 @@ function av_guess_codec(fmt,short_name,filename,mime_type,_type::AVMediaType) end function av_hex_dump(f,buf,size::Integer) - ccall((:av_hex_dump,libavformat),Void,(Ptr{Void},Ptr{UInt8},Cint),f,buf,size) + ccall((:av_hex_dump,libavformat),Cvoid,(Ptr{Cvoid},Ptr{UInt8},Cint),f,buf,size) end function av_hex_dump_log(avcl,level::Integer,buf,size::Integer) - ccall((:av_hex_dump_log,libavformat),Void,(Ptr{Void},Cint,Ptr{UInt8},Cint),avcl,level,buf,size) + ccall((:av_hex_dump_log,libavformat),Cvoid,(Ptr{Cvoid},Cint,Ptr{UInt8},Cint),avcl,level,buf,size) end function av_pkt_dump2(f,pkt,dump_payload::Integer,st) - ccall((:av_pkt_dump2,libavformat),Void,(Ptr{Void},Ptr{AVPacket},Cint,Ptr{AVStream}),f,pkt,dump_payload,st) + ccall((:av_pkt_dump2,libavformat),Cvoid,(Ptr{Cvoid},Ptr{AVPacket},Cint,Ptr{AVStream}),f,pkt,dump_payload,st) end function av_pkt_dump_log2(avcl,level::Integer,pkt,dump_payload::Integer,st) - ccall((:av_pkt_dump_log2,libavformat),Void,(Ptr{Void},Cint,Ptr{AVPacket},Cint,Ptr{AVStream}),avcl,level,pkt,dump_payload,st) + ccall((:av_pkt_dump_log2,libavformat),Cvoid,(Ptr{Cvoid},Cint,Ptr{AVPacket},Cint,Ptr{AVStream}),avcl,level,pkt,dump_payload,st) end function av_codec_get_id(tags,tag::Integer) @@ -240,11 +240,11 @@ function av_add_index_entry(st,pos::Int64,timestamp::Int64,size::Integer,distanc end function av_url_split(proto,proto_size::Integer,authorization,authorization_size::Integer,hostname,hostname_size::Integer,port_ptr,path,path_size::Integer,url) - ccall((:av_url_split,libavformat),Void,(Ptr{UInt8},Cint,Ptr{UInt8},Cint,Ptr{UInt8},Cint,Ptr{Cint},Ptr{UInt8},Cint,Ptr{UInt8}),proto,proto_size,authorization,authorization_size,hostname,hostname_size,port_ptr,path,path_size,url) + ccall((:av_url_split,libavformat),Cvoid,(Ptr{UInt8},Cint,Ptr{UInt8},Cint,Ptr{UInt8},Cint,Ptr{Cint},Ptr{UInt8},Cint,Ptr{UInt8}),proto,proto_size,authorization,authorization_size,hostname,hostname_size,port_ptr,path,path_size,url) end function av_dump_format(ic,index::Integer,url,is_output::Integer) - ccall((:av_dump_format,libavformat),Void,(Ptr{AVFormatContext},Cint,Ptr{UInt8},Cint),ic,index,url,is_output) + ccall((:av_dump_format,libavformat),Cvoid,(Ptr{AVFormatContext},Cint,Ptr{UInt8},Cint),ic,index,url,is_output) end function av_get_frame_filename(buf,buf_size::Integer,path,number::Integer) diff --git a/src/libav/AVFormat/v55/avio.jl b/src/libav/AVFormat/v55/avio.jl index 07ede27d..e695c1ae 100644 --- a/src/libav/AVFormat/v55/avio.jl +++ b/src/libav/AVFormat/v55/avio.jl @@ -51,47 +51,47 @@ function avio_check(url,flags::Integer) end function avio_alloc_context(buffer,buffer_size::Integer,write_flag::Integer,opaque,read_packet,write_packet,seek) - ccall((:avio_alloc_context,libavformat),Ptr{AVIOContext},(Ptr{Cuchar},Cint,Cint,Ptr{Void},Ptr{Void},Ptr{Void},Ptr{Void}),buffer,buffer_size,write_flag,opaque,read_packet,write_packet,seek) + ccall((:avio_alloc_context,libavformat),Ptr{AVIOContext},(Ptr{Cuchar},Cint,Cint,Ptr{Cvoid},Ptr{Cvoid},Ptr{Cvoid},Ptr{Cvoid}),buffer,buffer_size,write_flag,opaque,read_packet,write_packet,seek) end function avio_w8(s,b::Integer) - ccall((:avio_w8,libavformat),Void,(Ptr{AVIOContext},Cint),s,b) + ccall((:avio_w8,libavformat),Cvoid,(Ptr{AVIOContext},Cint),s,b) end function avio_write(s,buf,size::Integer) - ccall((:avio_write,libavformat),Void,(Ptr{AVIOContext},Ptr{Cuchar},Cint),s,buf,size) + ccall((:avio_write,libavformat),Cvoid,(Ptr{AVIOContext},Ptr{Cuchar},Cint),s,buf,size) end function avio_wl64(s,val::UInt64) - ccall((:avio_wl64,libavformat),Void,(Ptr{AVIOContext},UInt64),s,val) + ccall((:avio_wl64,libavformat),Cvoid,(Ptr{AVIOContext},UInt64),s,val) end function avio_wb64(s,val::UInt64) - ccall((:avio_wb64,libavformat),Void,(Ptr{AVIOContext},UInt64),s,val) + ccall((:avio_wb64,libavformat),Cvoid,(Ptr{AVIOContext},UInt64),s,val) end function avio_wl32(s,val::Integer) - ccall((:avio_wl32,libavformat),Void,(Ptr{AVIOContext},UInt32),s,val) + ccall((:avio_wl32,libavformat),Cvoid,(Ptr{AVIOContext},UInt32),s,val) end function avio_wb32(s,val::Integer) - ccall((:avio_wb32,libavformat),Void,(Ptr{AVIOContext},UInt32),s,val) + ccall((:avio_wb32,libavformat),Cvoid,(Ptr{AVIOContext},UInt32),s,val) end function avio_wl24(s,val::Integer) - ccall((:avio_wl24,libavformat),Void,(Ptr{AVIOContext},UInt32),s,val) + ccall((:avio_wl24,libavformat),Cvoid,(Ptr{AVIOContext},UInt32),s,val) end function avio_wb24(s,val::Integer) - ccall((:avio_wb24,libavformat),Void,(Ptr{AVIOContext},UInt32),s,val) + ccall((:avio_wb24,libavformat),Cvoid,(Ptr{AVIOContext},UInt32),s,val) end function avio_wl16(s,val::Integer) - ccall((:avio_wl16,libavformat),Void,(Ptr{AVIOContext},UInt32),s,val) + ccall((:avio_wl16,libavformat),Cvoid,(Ptr{AVIOContext},UInt32),s,val) end function avio_wb16(s,val::Integer) - ccall((:avio_wb16,libavformat),Void,(Ptr{AVIOContext},UInt32),s,val) + ccall((:avio_wb16,libavformat),Cvoid,(Ptr{AVIOContext},UInt32),s,val) end function avio_put_str(s,str) @@ -119,7 +119,7 @@ function avio_size(s) end function avio_flush(s) - ccall((:avio_flush,libavformat),Void,(Ptr{AVIOContext},),s) + ccall((:avio_flush,libavformat),Cvoid,(Ptr{AVIOContext},),s) end function avio_read(s,buf,size::Integer) @@ -199,7 +199,7 @@ function avio_close_dyn_buf(s,pbuffer) end function avio_enum_protocols(opaque,output::Integer) - ccall((:avio_enum_protocols,libavformat),Ptr{UInt8},(Ptr{Ptr{Void}},Cint),opaque,output) + ccall((:avio_enum_protocols,libavformat),Ptr{UInt8},(Ptr{Ptr{Cvoid}},Cint),opaque,output) end function avio_pause(h,pause::Integer) diff --git a/src/libav/AVFormat/v55/libavformat_h.jl b/src/libav/AVFormat/v55/libavformat_h.jl index be2b2b9d..e3f2714e 100644 --- a/src/libav/AVFormat/v55/libavformat_h.jl +++ b/src/libav/AVFormat/v55/libavformat_h.jl @@ -95,8 +95,8 @@ const AVIO_FLAG_READ_WRITE = AVIO_FLAG_READ | AVIO_FLAG_WRITE const AVIO_FLAG_NONBLOCK = 8 struct AVIOInterruptCB - callback::Ptr{Void} - opaque::Ptr{Void} + callback::Ptr{Cvoid} + opaque::Ptr{Cvoid} end struct AVIOContext @@ -105,10 +105,10 @@ struct AVIOContext buffer_size::Cint buf_ptr::Ptr{Cuchar} buf_end::Ptr{Cuchar} - opaque::Ptr{Void} - read_packet::Ptr{Void} - write_packet::Ptr{Void} - seek::Ptr{Void} + opaque::Ptr{Cvoid} + read_packet::Ptr{Cvoid} + write_packet::Ptr{Cvoid} + seek::Ptr{Cvoid} pos::Int64 must_flush::Cint eof_reached::Cint @@ -116,10 +116,10 @@ struct AVIOContext max_packet_size::Cint checksum::Culong checksum_ptr::Ptr{Cuchar} - update_checksum::Ptr{Void} + update_checksum::Ptr{Cvoid} error::Cint - read_pause::Ptr{Void} - read_seek::Ptr{Void} + read_pause::Ptr{Cvoid} + read_seek::Ptr{Cvoid} seekable::Cint end @@ -177,7 +177,7 @@ const AVSEEK_FLAG_BYTE = 2 const AVSEEK_FLAG_ANY = 4 const AVSEEK_FLAG_FRAME = 8 -const AVCodecTag=Void +const AVCodecTag=Nothing struct AVInputFormat name::Ptr{UInt8} @@ -189,15 +189,15 @@ struct AVInputFormat next::Ptr{AVInputFormat} raw_codec_id::Cint priv_data_size::Cint - read_probe::Ptr{Void} - read_header::Ptr{Void} - read_packet::Ptr{Void} - read_close::Ptr{Void} - read_seek::Ptr{Void} - read_timestamp::Ptr{Void} - read_play::Ptr{Void} - read_pause::Ptr{Void} - read_seek2::Ptr{Void} + read_probe::Ptr{Cvoid} + read_header::Ptr{Cvoid} + read_packet::Ptr{Cvoid} + read_close::Ptr{Cvoid} + read_seek::Ptr{Cvoid} + read_timestamp::Ptr{Cvoid} + read_play::Ptr{Cvoid} + read_pause::Ptr{Cvoid} + read_seek2::Ptr{Cvoid} end struct AVOutputFormat @@ -213,11 +213,11 @@ struct AVOutputFormat priv_class::Ptr{AVClass} next::Ptr{AVOutputFormat} priv_data_size::Cint - write_header::Ptr{Void} - write_packet::Ptr{Void} - write_trailer::Ptr{Void} - interleave_packet::Ptr{Void} - query_codec::Ptr{Void} + write_header::Ptr{Cvoid} + write_packet::Ptr{Cvoid} + write_trailer::Ptr{Cvoid} + interleave_packet::Ptr{Cvoid} + query_codec::Ptr{Cvoid} end struct AVFrac @@ -280,7 +280,7 @@ struct AVStream index::Cint id::Cint codec::Ptr{AVCodecContext} - priv_data::Ptr{Void} + priv_data::Ptr{Cvoid} pts::AVFrac time_base::AVRational start_time::Int64 @@ -292,7 +292,7 @@ struct AVStream metadata::Ptr{AVDictionary} avg_frame_rate::AVRational attached_pic::AVPacket - info::Ptr{Void} + info::Ptr{Cvoid} pts_wrap_bits::Cint do_not_use::Int64 first_dts::Int64 @@ -1357,13 +1357,13 @@ struct AVChapter metadata::Ptr{AVDictionary} end -const AVFormatInternal=Void +const AVFormatInternal=Nothing struct AVFormatContext av_class::Ptr{AVClass} iformat::Ptr{AVInputFormat} oformat::Ptr{AVOutputFormat} - priv_data::Ptr{Void} + priv_data::Ptr{Cvoid} pb::Ptr{AVIOContext} ctx_flags::Cint nb_streams::UInt32 diff --git a/src/libav/AVResample/v1/avresample.jl b/src/libav/AVResample/v1/avresample.jl index cab85eaa..2d875948 100644 --- a/src/libav/AVResample/v1/avresample.jl +++ b/src/libav/AVResample/v1/avresample.jl @@ -47,11 +47,11 @@ function avresample_open(avr) end function avresample_close(avr) - ccall((:avresample_close,libavresample),Void,(Ptr{AVAudioResampleContext},),avr) + ccall((:avresample_close,libavresample),Cvoid,(Ptr{AVAudioResampleContext},),avr) end function avresample_free(avr) - ccall((:avresample_free,libavresample),Void,(Ptr{Ptr{AVAudioResampleContext}},),avr) + ccall((:avresample_free,libavresample),Cvoid,(Ptr{Ptr{AVAudioResampleContext}},),avr) end function avresample_build_matrix(in_layout::UInt64,out_layout::UInt64,center_mix_level::Cdouble,surround_mix_level::Cdouble,lfe_mix_level::Cdouble,normalize::Integer,matrix,stride::Integer,matrix_encoding::AVMatrixEncoding) diff --git a/src/libav/AVResample/v1/libavresample_h.jl b/src/libav/AVResample/v1/libavresample_h.jl index 34fb4d33..f49d14ef 100644 --- a/src/libav/AVResample/v1/libavresample_h.jl +++ b/src/libav/AVResample/v1/libavresample_h.jl @@ -22,7 +22,7 @@ export const AVRESAMPLE_MAX_CHANNELS = 32 -const AVAudioResampleContext=Void +const AVAudioResampleContext=Nothing # begin enum AVMixCoeffType const AVMixCoeffType=UInt32 diff --git a/src/libav/AVUtil/v51/audioconvert.jl b/src/libav/AVUtil/v51/audioconvert.jl index c7e24713..104168a2 100644 --- a/src/libav/AVUtil/v51/audioconvert.jl +++ b/src/libav/AVUtil/v51/audioconvert.jl @@ -13,7 +13,7 @@ function av_get_channel_layout(name) end function av_get_channel_layout_string(buf,buf_size::Integer,nb_channels::Integer,channel_layout::UInt64) - ccall((:av_get_channel_layout_string,libavutil),Void,(Ptr{UInt8},Cint,Cint,UInt64),buf,buf_size,nb_channels,channel_layout) + ccall((:av_get_channel_layout_string,libavutil),Cvoid,(Ptr{UInt8},Cint,Cint,UInt64),buf,buf_size,nb_channels,channel_layout) end function av_get_channel_layout_nb_channels(channel_layout::UInt64) diff --git a/src/libav/AVUtil/v51/dict.jl b/src/libav/AVUtil/v51/dict.jl index f793cb73..aa61f0a0 100644 --- a/src/libav/AVUtil/v51/dict.jl +++ b/src/libav/AVUtil/v51/dict.jl @@ -18,9 +18,9 @@ function av_dict_set(pm,key,value,flags::Integer) end function av_dict_copy(dst,src,flags::Integer) - ccall((:av_dict_copy,libavutil),Void,(Ptr{Ptr{AVDictionary}},Ptr{AVDictionary},Cint),dst,src,flags) + ccall((:av_dict_copy,libavutil),Cvoid,(Ptr{Ptr{AVDictionary}},Ptr{AVDictionary},Cint),dst,src,flags) end function av_dict_free(m) - ccall((:av_dict_free,libavutil),Void,(Ptr{Ptr{AVDictionary}},),m) + ccall((:av_dict_free,libavutil),Cvoid,(Ptr{Ptr{AVDictionary}},),m) end diff --git a/src/libav/AVUtil/v51/fifo.jl b/src/libav/AVUtil/v51/fifo.jl index 62a83524..3bbd8b5f 100644 --- a/src/libav/AVUtil/v51/fifo.jl +++ b/src/libav/AVUtil/v51/fifo.jl @@ -21,11 +21,11 @@ function av_fifo_alloc(size::Integer) end function av_fifo_free(f) - ccall((:av_fifo_free,libavutil),Void,(Ptr{AVFifoBuffer},),f) + ccall((:av_fifo_free,libavutil),Cvoid,(Ptr{AVFifoBuffer},),f) end function av_fifo_reset(f) - ccall((:av_fifo_reset,libavutil),Void,(Ptr{AVFifoBuffer},),f) + ccall((:av_fifo_reset,libavutil),Cvoid,(Ptr{AVFifoBuffer},),f) end function av_fifo_size(f) @@ -37,11 +37,11 @@ function av_fifo_space(f) end function av_fifo_generic_read(f,dest,buf_size::Integer,func) - ccall((:av_fifo_generic_read,libavutil),Cint,(Ptr{AVFifoBuffer},Ptr{Void},Cint,Ptr{Void}),f,dest,buf_size,func) + ccall((:av_fifo_generic_read,libavutil),Cint,(Ptr{AVFifoBuffer},Ptr{Cvoid},Cint,Ptr{Cvoid}),f,dest,buf_size,func) end function av_fifo_generic_write(f,src,size::Integer,func) - ccall((:av_fifo_generic_write,libavutil),Cint,(Ptr{AVFifoBuffer},Ptr{Void},Cint,Ptr{Void}),f,src,size,func) + ccall((:av_fifo_generic_write,libavutil),Cint,(Ptr{AVFifoBuffer},Ptr{Cvoid},Cint,Ptr{Cvoid}),f,src,size,func) end function av_fifo_realloc2(f,size::Integer) @@ -49,7 +49,7 @@ function av_fifo_realloc2(f,size::Integer) end function av_fifo_drain(f,size::Integer) - ccall((:av_fifo_drain,libavutil),Void,(Ptr{AVFifoBuffer},Cint),f,size) + ccall((:av_fifo_drain,libavutil),Cvoid,(Ptr{AVFifoBuffer},Cint),f,size) end function av_fifo_peek2(f,offs::Integer) diff --git a/src/libav/AVUtil/v51/file.jl b/src/libav/AVUtil/v51/file.jl index 3f4ef293..5bd301fc 100644 --- a/src/libav/AVUtil/v51/file.jl +++ b/src/libav/AVUtil/v51/file.jl @@ -8,9 +8,9 @@ export function av_file_map(filename,bufptr,size,log_offset::Integer,log_ctx) - ccall((:av_file_map,libavutil),Cint,(Ptr{UInt8},Ptr{Ptr{UInt8}},Ptr{Csize_t},Cint,Ptr{Void}),filename,bufptr,size,log_offset,log_ctx) + ccall((:av_file_map,libavutil),Cint,(Ptr{UInt8},Ptr{Ptr{UInt8}},Ptr{Csize_t},Cint,Ptr{Cvoid}),filename,bufptr,size,log_offset,log_ctx) end function av_file_unmap(bufptr,size::Csize_t) - ccall((:av_file_unmap,libavutil),Void,(Ptr{UInt8},Csize_t),bufptr,size) + ccall((:av_file_unmap,libavutil),Cvoid,(Ptr{UInt8},Csize_t),bufptr,size) end diff --git a/src/libav/AVUtil/v51/imgutils.jl b/src/libav/AVUtil/v51/imgutils.jl index 44b95167..00acfff7 100644 --- a/src/libav/AVUtil/v51/imgutils.jl +++ b/src/libav/AVUtil/v51/imgutils.jl @@ -15,7 +15,7 @@ export function av_image_fill_max_pixsteps(max_pixsteps,max_pixstep_comps,pixdesc) - ccall((:av_image_fill_max_pixsteps,libavutil),Void,(Ptr{Cint},Ptr{Cint},Ptr{AVPixFmtDescriptor}),max_pixsteps,max_pixstep_comps,pixdesc) + ccall((:av_image_fill_max_pixsteps,libavutil),Cvoid,(Ptr{Cint},Ptr{Cint},Ptr{AVPixFmtDescriptor}),max_pixsteps,max_pixstep_comps,pixdesc) end function av_image_get_linesize(pix_fmt::PixelFormat,width::Integer,plane::Integer) @@ -35,15 +35,15 @@ function av_image_alloc(pointers,linesizes,w::Integer,h::Integer,pix_fmt::PixelF end function av_image_copy_plane(dst,dst_linesize::Integer,src,src_linesize::Integer,bytewidth::Integer,height::Integer) - ccall((:av_image_copy_plane,libavutil),Void,(Ptr{UInt8},Cint,Ptr{UInt8},Cint,Cint,Cint),dst,dst_linesize,src,src_linesize,bytewidth,height) + ccall((:av_image_copy_plane,libavutil),Cvoid,(Ptr{UInt8},Cint,Ptr{UInt8},Cint,Cint,Cint),dst,dst_linesize,src,src_linesize,bytewidth,height) end function av_image_copy(dst_data,dst_linesizes,src_data,src_linesizes,pix_fmt::PixelFormat,width::Integer,height::Integer) - ccall((:av_image_copy,libavutil),Void,(Ptr{Ptr{UInt8}},Ptr{Cint},Ptr{Ptr{UInt8}},Ptr{Cint},PixelFormat,Cint,Cint),dst_data,dst_linesizes,src_data,src_linesizes,pix_fmt,width,height) + ccall((:av_image_copy,libavutil),Cvoid,(Ptr{Ptr{UInt8}},Ptr{Cint},Ptr{Ptr{UInt8}},Ptr{Cint},PixelFormat,Cint,Cint),dst_data,dst_linesizes,src_data,src_linesizes,pix_fmt,width,height) end function av_image_check_size(w::Integer,h::Integer,log_offset::Integer,log_ctx) - ccall((:av_image_check_size,libavutil),Cint,(UInt32,UInt32,Cint,Ptr{Void}),w,h,log_offset,log_ctx) + ccall((:av_image_check_size,libavutil),Cint,(UInt32,UInt32,Cint,Ptr{Cvoid}),w,h,log_offset,log_ctx) end function ff_set_systematic_pal2(pal,pix_fmt::PixelFormat) diff --git a/src/libav/AVUtil/v51/libavutil_h.jl b/src/libav/AVUtil/v51/libavutil_h.jl index d217aaa7..118dbcd4 100644 --- a/src/libav/AVUtil/v51/libavutil_h.jl +++ b/src/libav/AVUtil/v51/libavutil_h.jl @@ -401,7 +401,7 @@ struct AVDictionaryEntry value::Ptr{UInt8} end -const AVDictionary=Void +const AVDictionary=Nothing const AV_LOG_QUIET = -8 const AV_LOG_PANIC = 0 @@ -443,7 +443,7 @@ struct AVOption help::Ptr{UInt8} offset::Cint _type::AVOptionType - default_val::Void + default_val::Nothing min::Cdouble max::Cdouble flags::Cint @@ -452,13 +452,13 @@ end struct AVClass class_name::Ptr{UInt8} - item_name::Ptr{Void} + item_name::Ptr{Cvoid} option::Ptr{AVOption} version::Cint log_level_offset_offset::Cint parent_log_context_offset::Cint - child_next::Ptr{Void} - child_class_next::Ptr{Void} + child_next::Ptr{Cvoid} + child_class_next::Ptr{Cvoid} end # Skipping MacroDefinition: DECLARE_ALIGNED ( n , t , v ) t __attribute__ ( ( aligned ( n ) ) ) v diff --git a/src/libav/AVUtil/v51/log.jl b/src/libav/AVUtil/v51/log.jl index 09d53369..f8b6d15a 100644 --- a/src/libav/AVUtil/v51/log.jl +++ b/src/libav/AVUtil/v51/log.jl @@ -21,11 +21,11 @@ function av_log_get_level() end function av_log_set_level(arg1::Integer) - ccall((:av_log_set_level,libavutil),Void,(Cint,),arg1) + ccall((:av_log_set_level,libavutil),Cvoid,(Cint,),arg1) end function av_log_set_callback(arg1) - ccall((:av_log_set_callback,libavutil),Void,(Ptr{Void},),arg1) + ccall((:av_log_set_callback,libavutil),Cvoid,(Ptr{Cvoid},),arg1) end # function av_log_default_callback(ptr,level::Integer,fmt,vl) @@ -33,9 +33,9 @@ end # end function av_default_item_name(ctx) - ccall((:av_default_item_name,libavutil),Ptr{UInt8},(Ptr{Void},),ctx) + ccall((:av_default_item_name,libavutil),Ptr{UInt8},(Ptr{Cvoid},),ctx) end function av_log_set_flags(arg::Integer) - ccall((:av_log_set_flags,libavutil),Void,(Cint,),arg) + ccall((:av_log_set_flags,libavutil),Cvoid,(Cint,),arg) end diff --git a/src/libav/AVUtil/v51/mem.jl b/src/libav/AVUtil/v51/mem.jl index 8a30041b..bb9604ab 100644 --- a/src/libav/AVUtil/v51/mem.jl +++ b/src/libav/AVUtil/v51/mem.jl @@ -12,19 +12,19 @@ export function av_malloc(size::Csize_t) - ccall((:av_malloc,libavutil),Ptr{Void},(Csize_t,),size) + ccall((:av_malloc,libavutil),Ptr{Cvoid},(Csize_t,),size) end function av_realloc(ptr,size::Csize_t) - ccall((:av_realloc,libavutil),Ptr{Void},(Ptr{Void},Csize_t),ptr,size) + ccall((:av_realloc,libavutil),Ptr{Cvoid},(Ptr{Cvoid},Csize_t),ptr,size) end function av_free(ptr) - ccall((:av_free,libavutil),Void,(Ptr{Void},),ptr) + ccall((:av_free,libavutil),Cvoid,(Ptr{Cvoid},),ptr) end function av_mallocz(size::Csize_t) - ccall((:av_mallocz,libavutil),Ptr{Void},(Csize_t,),size) + ccall((:av_mallocz,libavutil),Ptr{Cvoid},(Csize_t,),size) end function av_strdup(s) @@ -32,5 +32,5 @@ function av_strdup(s) end function av_freep(ptr) - ccall((:av_freep,libavutil),Void,(Ptr{Void},),ptr) + ccall((:av_freep,libavutil),Cvoid,(Ptr{Cvoid},),ptr) end diff --git a/src/libav/AVUtil/v51/opt.jl b/src/libav/AVUtil/v51/opt.jl index e1966c9a..079ddf06 100644 --- a/src/libav/AVUtil/v51/opt.jl +++ b/src/libav/AVUtil/v51/opt.jl @@ -42,111 +42,111 @@ export function av_find_opt(obj,name,unit,mask::Integer,flags::Integer) - ccall((:av_find_opt,libavutil),Ptr{AVOption},(Ptr{Void},Ptr{UInt8},Ptr{UInt8},Cint,Cint),obj,name,unit,mask,flags) + ccall((:av_find_opt,libavutil),Ptr{AVOption},(Ptr{Cvoid},Ptr{UInt8},Ptr{UInt8},Cint,Cint),obj,name,unit,mask,flags) end function av_set_string3(obj,name,val,alloc::Integer,o_out) - ccall((:av_set_string3,libavutil),Cint,(Ptr{Void},Ptr{UInt8},Ptr{UInt8},Cint,Ptr{Ptr{AVOption}}),obj,name,val,alloc,o_out) + ccall((:av_set_string3,libavutil),Cint,(Ptr{Cvoid},Ptr{UInt8},Ptr{UInt8},Cint,Ptr{Ptr{AVOption}}),obj,name,val,alloc,o_out) end function av_set_double(obj,name,n::Cdouble) - ccall((:av_set_double,libavutil),Ptr{AVOption},(Ptr{Void},Ptr{UInt8},Cdouble),obj,name,n) + ccall((:av_set_double,libavutil),Ptr{AVOption},(Ptr{Cvoid},Ptr{UInt8},Cdouble),obj,name,n) end function av_set_q(obj,name,n::AVRational) - ccall((:av_set_q,libavutil),Ptr{AVOption},(Ptr{Void},Ptr{UInt8},AVRational),obj,name,n) + ccall((:av_set_q,libavutil),Ptr{AVOption},(Ptr{Cvoid},Ptr{UInt8},AVRational),obj,name,n) end function av_set_int(obj,name,n::Int64) - ccall((:av_set_int,libavutil),Ptr{AVOption},(Ptr{Void},Ptr{UInt8},Int64),obj,name,n) + ccall((:av_set_int,libavutil),Ptr{AVOption},(Ptr{Cvoid},Ptr{UInt8},Int64),obj,name,n) end function av_get_double(obj,name,o_out) - ccall((:av_get_double,libavutil),Cdouble,(Ptr{Void},Ptr{UInt8},Ptr{Ptr{AVOption}}),obj,name,o_out) + ccall((:av_get_double,libavutil),Cdouble,(Ptr{Cvoid},Ptr{UInt8},Ptr{Ptr{AVOption}}),obj,name,o_out) end function av_get_q(obj,name,o_out) - ccall((:av_get_q,libavutil),AVRational,(Ptr{Void},Ptr{UInt8},Ptr{Ptr{AVOption}}),obj,name,o_out) + ccall((:av_get_q,libavutil),AVRational,(Ptr{Cvoid},Ptr{UInt8},Ptr{Ptr{AVOption}}),obj,name,o_out) end function av_get_int(obj,name,o_out) - ccall((:av_get_int,libavutil),Int64,(Ptr{Void},Ptr{UInt8},Ptr{Ptr{AVOption}}),obj,name,o_out) + ccall((:av_get_int,libavutil),Int64,(Ptr{Cvoid},Ptr{UInt8},Ptr{Ptr{AVOption}}),obj,name,o_out) end function av_get_string(obj,name,o_out,buf,buf_len::Integer) - ccall((:av_get_string,libavutil),Ptr{UInt8},(Ptr{Void},Ptr{UInt8},Ptr{Ptr{AVOption}},Ptr{UInt8},Cint),obj,name,o_out,buf,buf_len) + ccall((:av_get_string,libavutil),Ptr{UInt8},(Ptr{Cvoid},Ptr{UInt8},Ptr{Ptr{AVOption}},Ptr{UInt8},Cint),obj,name,o_out,buf,buf_len) end function av_next_option(obj,last) - ccall((:av_next_option,libavutil),Ptr{AVOption},(Ptr{Void},Ptr{AVOption}),obj,last) + ccall((:av_next_option,libavutil),Ptr{AVOption},(Ptr{Cvoid},Ptr{AVOption}),obj,last) end function av_opt_show2(obj,av_log_obj,req_flags::Integer,rej_flags::Integer) - ccall((:av_opt_show2,libavutil),Cint,(Ptr{Void},Ptr{Void},Cint,Cint),obj,av_log_obj,req_flags,rej_flags) + ccall((:av_opt_show2,libavutil),Cint,(Ptr{Cvoid},Ptr{Cvoid},Cint,Cint),obj,av_log_obj,req_flags,rej_flags) end function av_opt_set_defaults(s) - ccall((:av_opt_set_defaults,libavutil),Void,(Ptr{Void},),s) + ccall((:av_opt_set_defaults,libavutil),Cvoid,(Ptr{Cvoid},),s) end function av_opt_set_defaults2(s,mask::Integer,flags::Integer) - ccall((:av_opt_set_defaults2,libavutil),Void,(Ptr{Void},Cint,Cint),s,mask,flags) + ccall((:av_opt_set_defaults2,libavutil),Cvoid,(Ptr{Cvoid},Cint,Cint),s,mask,flags) end function av_set_options_string(ctx,opts,key_val_sep,pairs_sep) - ccall((:av_set_options_string,libavutil),Cint,(Ptr{Void},Ptr{UInt8},Ptr{UInt8},Ptr{UInt8}),ctx,opts,key_val_sep,pairs_sep) + ccall((:av_set_options_string,libavutil),Cint,(Ptr{Cvoid},Ptr{UInt8},Ptr{UInt8},Ptr{UInt8}),ctx,opts,key_val_sep,pairs_sep) end function av_opt_free(obj) - ccall((:av_opt_free,libavutil),Void,(Ptr{Void},),obj) + ccall((:av_opt_free,libavutil),Cvoid,(Ptr{Cvoid},),obj) end function av_opt_flag_is_set(obj,field_name,flag_name) - ccall((:av_opt_flag_is_set,libavutil),Cint,(Ptr{Void},Ptr{UInt8},Ptr{UInt8}),obj,field_name,flag_name) + ccall((:av_opt_flag_is_set,libavutil),Cint,(Ptr{Cvoid},Ptr{UInt8},Ptr{UInt8}),obj,field_name,flag_name) end function av_opt_set_dict(obj,options) - ccall((:av_opt_set_dict,libavutil),Cint,(Ptr{Void},Ptr{Ptr{AVDictionary}}),obj,options) + ccall((:av_opt_set_dict,libavutil),Cint,(Ptr{Cvoid},Ptr{Ptr{AVDictionary}}),obj,options) end function av_opt_eval_flags(obj,o,val,flags_out) - ccall((:av_opt_eval_flags,libavutil),Cint,(Ptr{Void},Ptr{AVOption},Ptr{UInt8},Ptr{Cint}),obj,o,val,flags_out) + ccall((:av_opt_eval_flags,libavutil),Cint,(Ptr{Cvoid},Ptr{AVOption},Ptr{UInt8},Ptr{Cint}),obj,o,val,flags_out) end function av_opt_eval_int(obj,o,val,int_out) - ccall((:av_opt_eval_int,libavutil),Cint,(Ptr{Void},Ptr{AVOption},Ptr{UInt8},Ptr{Cint}),obj,o,val,int_out) + ccall((:av_opt_eval_int,libavutil),Cint,(Ptr{Cvoid},Ptr{AVOption},Ptr{UInt8},Ptr{Cint}),obj,o,val,int_out) end function av_opt_eval_int64(obj,o,val,int64_out) - ccall((:av_opt_eval_int64,libavutil),Cint,(Ptr{Void},Ptr{AVOption},Ptr{UInt8},Ptr{Int64}),obj,o,val,int64_out) + ccall((:av_opt_eval_int64,libavutil),Cint,(Ptr{Cvoid},Ptr{AVOption},Ptr{UInt8},Ptr{Int64}),obj,o,val,int64_out) end function av_opt_eval_float(obj,o,val,float_out) - ccall((:av_opt_eval_float,libavutil),Cint,(Ptr{Void},Ptr{AVOption},Ptr{UInt8},Ptr{Cfloat}),obj,o,val,float_out) + ccall((:av_opt_eval_float,libavutil),Cint,(Ptr{Cvoid},Ptr{AVOption},Ptr{UInt8},Ptr{Cfloat}),obj,o,val,float_out) end function av_opt_eval_double(obj,o,val,double_out) - ccall((:av_opt_eval_double,libavutil),Cint,(Ptr{Void},Ptr{AVOption},Ptr{UInt8},Ptr{Cdouble}),obj,o,val,double_out) + ccall((:av_opt_eval_double,libavutil),Cint,(Ptr{Cvoid},Ptr{AVOption},Ptr{UInt8},Ptr{Cdouble}),obj,o,val,double_out) end function av_opt_eval_q(obj,o,val,q_out) - ccall((:av_opt_eval_q,libavutil),Cint,(Ptr{Void},Ptr{AVOption},Ptr{UInt8},Ptr{AVRational}),obj,o,val,q_out) + ccall((:av_opt_eval_q,libavutil),Cint,(Ptr{Cvoid},Ptr{AVOption},Ptr{UInt8},Ptr{AVRational}),obj,o,val,q_out) end function av_opt_find(obj,name,unit,opt_flags::Integer,search_flags::Integer) - ccall((:av_opt_find,libavutil),Ptr{AVOption},(Ptr{Void},Ptr{UInt8},Ptr{UInt8},Cint,Cint),obj,name,unit,opt_flags,search_flags) + ccall((:av_opt_find,libavutil),Ptr{AVOption},(Ptr{Cvoid},Ptr{UInt8},Ptr{UInt8},Cint,Cint),obj,name,unit,opt_flags,search_flags) end function av_opt_find2(obj,name,unit,opt_flags::Integer,search_flags::Integer,target_obj) - ccall((:av_opt_find2,libavutil),Ptr{AVOption},(Ptr{Void},Ptr{UInt8},Ptr{UInt8},Cint,Cint,Ptr{Ptr{Void}}),obj,name,unit,opt_flags,search_flags,target_obj) + ccall((:av_opt_find2,libavutil),Ptr{AVOption},(Ptr{Cvoid},Ptr{UInt8},Ptr{UInt8},Cint,Cint,Ptr{Ptr{Cvoid}}),obj,name,unit,opt_flags,search_flags,target_obj) end function av_opt_next(obj,prev) - ccall((:av_opt_next,libavutil),Ptr{AVOption},(Ptr{Void},Ptr{AVOption}),obj,prev) + ccall((:av_opt_next,libavutil),Ptr{AVOption},(Ptr{Cvoid},Ptr{AVOption}),obj,prev) end function av_opt_child_next(obj,prev) - ccall((:av_opt_child_next,libavutil),Ptr{Void},(Ptr{Void},Ptr{Void}),obj,prev) + ccall((:av_opt_child_next,libavutil),Ptr{Cvoid},(Ptr{Cvoid},Ptr{Cvoid}),obj,prev) end function av_opt_child_class_next(parent,prev) @@ -154,33 +154,33 @@ function av_opt_child_class_next(parent,prev) end function av_opt_set(obj,name,val,search_flags::Integer) - ccall((:av_opt_set,libavutil),Cint,(Ptr{Void},Ptr{UInt8},Ptr{UInt8},Cint),obj,name,val,search_flags) + ccall((:av_opt_set,libavutil),Cint,(Ptr{Cvoid},Ptr{UInt8},Ptr{UInt8},Cint),obj,name,val,search_flags) end function av_opt_set_int(obj,name,val::Int64,search_flags::Integer) - ccall((:av_opt_set_int,libavutil),Cint,(Ptr{Void},Ptr{UInt8},Int64,Cint),obj,name,val,search_flags) + ccall((:av_opt_set_int,libavutil),Cint,(Ptr{Cvoid},Ptr{UInt8},Int64,Cint),obj,name,val,search_flags) end function av_opt_set_double(obj,name,val::Cdouble,search_flags::Integer) - ccall((:av_opt_set_double,libavutil),Cint,(Ptr{Void},Ptr{UInt8},Cdouble,Cint),obj,name,val,search_flags) + ccall((:av_opt_set_double,libavutil),Cint,(Ptr{Cvoid},Ptr{UInt8},Cdouble,Cint),obj,name,val,search_flags) end function av_opt_set_q(obj,name,val::AVRational,search_flags::Integer) - ccall((:av_opt_set_q,libavutil),Cint,(Ptr{Void},Ptr{UInt8},AVRational,Cint),obj,name,val,search_flags) + ccall((:av_opt_set_q,libavutil),Cint,(Ptr{Cvoid},Ptr{UInt8},AVRational,Cint),obj,name,val,search_flags) end function av_opt_get(obj,name,search_flags::Integer,out_val) - ccall((:av_opt_get,libavutil),Cint,(Ptr{Void},Ptr{UInt8},Cint,Ptr{Ptr{UInt8}}),obj,name,search_flags,out_val) + ccall((:av_opt_get,libavutil),Cint,(Ptr{Cvoid},Ptr{UInt8},Cint,Ptr{Ptr{UInt8}}),obj,name,search_flags,out_val) end function av_opt_get_int(obj,name,search_flags::Integer,out_val) - ccall((:av_opt_get_int,libavutil),Cint,(Ptr{Void},Ptr{UInt8},Cint,Ptr{Int64}),obj,name,search_flags,out_val) + ccall((:av_opt_get_int,libavutil),Cint,(Ptr{Cvoid},Ptr{UInt8},Cint,Ptr{Int64}),obj,name,search_flags,out_val) end function av_opt_get_double(obj,name,search_flags::Integer,out_val) - ccall((:av_opt_get_double,libavutil),Cint,(Ptr{Void},Ptr{UInt8},Cint,Ptr{Cdouble}),obj,name,search_flags,out_val) + ccall((:av_opt_get_double,libavutil),Cint,(Ptr{Cvoid},Ptr{UInt8},Cint,Ptr{Cdouble}),obj,name,search_flags,out_val) end function av_opt_get_q(obj,name,search_flags::Integer,out_val) - ccall((:av_opt_get_q,libavutil),Cint,(Ptr{Void},Ptr{UInt8},Cint,Ptr{AVRational}),obj,name,search_flags,out_val) + ccall((:av_opt_get_q,libavutil),Cint,(Ptr{Cvoid},Ptr{UInt8},Cint,Ptr{AVRational}),obj,name,search_flags,out_val) end diff --git a/src/libav/AVUtil/v51/pixdesc.jl b/src/libav/AVUtil/v51/pixdesc.jl index c7c45c02..361c1419 100644 --- a/src/libav/AVUtil/v51/pixdesc.jl +++ b/src/libav/AVUtil/v51/pixdesc.jl @@ -12,11 +12,11 @@ export function av_read_image_line(dst,data,linesize,desc,x::Integer,y::Integer,c::Integer,w::Integer,read_pal_component::Integer) - ccall((:av_read_image_line,libavutil),Void,(Ptr{UInt16},Ptr{Ptr{UInt8}},Ptr{Cint},Ptr{AVPixFmtDescriptor},Cint,Cint,Cint,Cint,Cint),dst,data,linesize,desc,x,y,c,w,read_pal_component) + ccall((:av_read_image_line,libavutil),Cvoid,(Ptr{UInt16},Ptr{Ptr{UInt8}},Ptr{Cint},Ptr{AVPixFmtDescriptor},Cint,Cint,Cint,Cint,Cint),dst,data,linesize,desc,x,y,c,w,read_pal_component) end function av_write_image_line(src,data,linesize,desc,x::Integer,y::Integer,c::Integer,w::Integer) - ccall((:av_write_image_line,libavutil),Void,(Ptr{UInt16},Ptr{Ptr{UInt8}},Ptr{Cint},Ptr{AVPixFmtDescriptor},Cint,Cint,Cint,Cint),src,data,linesize,desc,x,y,c,w) + ccall((:av_write_image_line,libavutil),Cvoid,(Ptr{UInt16},Ptr{Ptr{UInt8}},Ptr{Cint},Ptr{AVPixFmtDescriptor},Cint,Cint,Cint,Cint),src,data,linesize,desc,x,y,c,w) end function av_get_pix_fmt(name) diff --git a/src/libav/AVUtil/v52/audio_fifo.jl b/src/libav/AVUtil/v52/audio_fifo.jl index 20266db3..761cfe6d 100644 --- a/src/libav/AVUtil/v52/audio_fifo.jl +++ b/src/libav/AVUtil/v52/audio_fifo.jl @@ -15,7 +15,7 @@ export function av_audio_fifo_free(af) - ccall((:av_audio_fifo_free,libavutil),Void,(Ptr{AVAudioFifo},),af) + ccall((:av_audio_fifo_free,libavutil),Cvoid,(Ptr{AVAudioFifo},),af) end function av_audio_fifo_alloc(sample_fmt::AVSampleFormat,channels::Integer,nb_samples::Integer) @@ -27,11 +27,11 @@ function av_audio_fifo_realloc(af,nb_samples::Integer) end function av_audio_fifo_write(af,data,nb_samples::Integer) - ccall((:av_audio_fifo_write,libavutil),Cint,(Ptr{AVAudioFifo},Ptr{Ptr{Void}},Cint),af,data,nb_samples) + ccall((:av_audio_fifo_write,libavutil),Cint,(Ptr{AVAudioFifo},Ptr{Ptr{Cvoid}},Cint),af,data,nb_samples) end function av_audio_fifo_read(af,data,nb_samples::Integer) - ccall((:av_audio_fifo_read,libavutil),Cint,(Ptr{AVAudioFifo},Ptr{Ptr{Void}},Cint),af,data,nb_samples) + ccall((:av_audio_fifo_read,libavutil),Cint,(Ptr{AVAudioFifo},Ptr{Ptr{Cvoid}},Cint),af,data,nb_samples) end function av_audio_fifo_drain(af,nb_samples::Integer) @@ -39,7 +39,7 @@ function av_audio_fifo_drain(af,nb_samples::Integer) end function av_audio_fifo_reset(af) - ccall((:av_audio_fifo_reset,libavutil),Void,(Ptr{AVAudioFifo},),af) + ccall((:av_audio_fifo_reset,libavutil),Cvoid,(Ptr{AVAudioFifo},),af) end function av_audio_fifo_size(af) diff --git a/src/libav/AVUtil/v52/channel_layout.jl b/src/libav/AVUtil/v52/channel_layout.jl index b7e4cc64..29e125ae 100644 --- a/src/libav/AVUtil/v52/channel_layout.jl +++ b/src/libav/AVUtil/v52/channel_layout.jl @@ -17,7 +17,7 @@ function av_get_channel_layout(name) end function av_get_channel_layout_string(buf,buf_size::Integer,nb_channels::Integer,channel_layout::UInt64) - ccall((:av_get_channel_layout_string,libavutil),Void,(Ptr{UInt8},Cint,Cint,UInt64),buf,buf_size,nb_channels,channel_layout) + ccall((:av_get_channel_layout_string,libavutil),Cvoid,(Ptr{UInt8},Cint,Cint,UInt64),buf,buf_size,nb_channels,channel_layout) end function av_get_channel_layout_nb_channels(channel_layout::UInt64) diff --git a/src/libav/AVUtil/v52/dict.jl b/src/libav/AVUtil/v52/dict.jl index b7d17712..a29adb64 100644 --- a/src/libav/AVUtil/v52/dict.jl +++ b/src/libav/AVUtil/v52/dict.jl @@ -23,9 +23,9 @@ function av_dict_set(pm,key,value,flags::Integer) end function av_dict_copy(dst,src,flags::Integer) - ccall((:av_dict_copy,libavutil),Void,(Ptr{Ptr{AVDictionary}},Ptr{AVDictionary},Cint),dst,src,flags) + ccall((:av_dict_copy,libavutil),Cvoid,(Ptr{Ptr{AVDictionary}},Ptr{AVDictionary},Cint),dst,src,flags) end function av_dict_free(m) - ccall((:av_dict_free,libavutil),Void,(Ptr{Ptr{AVDictionary}},),m) + ccall((:av_dict_free,libavutil),Cvoid,(Ptr{Ptr{AVDictionary}},),m) end diff --git a/src/libav/AVUtil/v52/fifo.jl b/src/libav/AVUtil/v52/fifo.jl index af5d15c0..a991eab0 100644 --- a/src/libav/AVUtil/v52/fifo.jl +++ b/src/libav/AVUtil/v52/fifo.jl @@ -20,11 +20,11 @@ function av_fifo_alloc(size::Integer) end function av_fifo_free(f) - ccall((:av_fifo_free,libavutil),Void,(Ptr{AVFifoBuffer},),f) + ccall((:av_fifo_free,libavutil),Cvoid,(Ptr{AVFifoBuffer},),f) end function av_fifo_reset(f) - ccall((:av_fifo_reset,libavutil),Void,(Ptr{AVFifoBuffer},),f) + ccall((:av_fifo_reset,libavutil),Cvoid,(Ptr{AVFifoBuffer},),f) end function av_fifo_size(f) @@ -36,11 +36,11 @@ function av_fifo_space(f) end function av_fifo_generic_read(f,dest,buf_size::Integer,func) - ccall((:av_fifo_generic_read,libavutil),Cint,(Ptr{AVFifoBuffer},Ptr{Void},Cint,Ptr{Void}),f,dest,buf_size,func) + ccall((:av_fifo_generic_read,libavutil),Cint,(Ptr{AVFifoBuffer},Ptr{Cvoid},Cint,Ptr{Cvoid}),f,dest,buf_size,func) end function av_fifo_generic_write(f,src,size::Integer,func) - ccall((:av_fifo_generic_write,libavutil),Cint,(Ptr{AVFifoBuffer},Ptr{Void},Cint,Ptr{Void}),f,src,size,func) + ccall((:av_fifo_generic_write,libavutil),Cint,(Ptr{AVFifoBuffer},Ptr{Cvoid},Cint,Ptr{Cvoid}),f,src,size,func) end function av_fifo_realloc2(f,size::Integer) @@ -48,7 +48,7 @@ function av_fifo_realloc2(f,size::Integer) end function av_fifo_drain(f,size::Integer) - ccall((:av_fifo_drain,libavutil),Void,(Ptr{AVFifoBuffer},Cint),f,size) + ccall((:av_fifo_drain,libavutil),Cvoid,(Ptr{AVFifoBuffer},Cint),f,size) end function av_fifo_peek2(f,offs::Integer) diff --git a/src/libav/AVUtil/v52/file.jl b/src/libav/AVUtil/v52/file.jl index 19fb445b..2ef9f53e 100644 --- a/src/libav/AVUtil/v52/file.jl +++ b/src/libav/AVUtil/v52/file.jl @@ -8,9 +8,9 @@ export function av_file_map(filename,bufptr,size,log_offset::Integer,log_ctx) - ccall((:av_file_map,libavutil),Cint,(Ptr{UInt8},Ptr{Ptr{UInt8}},Ptr{Csize_t},Cint,Ptr{Void}),filename,bufptr,size,log_offset,log_ctx) + ccall((:av_file_map,libavutil),Cint,(Ptr{UInt8},Ptr{Ptr{UInt8}},Ptr{Csize_t},Cint,Ptr{Cvoid}),filename,bufptr,size,log_offset,log_ctx) end function av_file_unmap(bufptr,size::Csize_t) - ccall((:av_file_unmap,libavutil),Void,(Ptr{UInt8},Csize_t),bufptr,size) + ccall((:av_file_unmap,libavutil),Cvoid,(Ptr{UInt8},Csize_t),bufptr,size) end diff --git a/src/libav/AVUtil/v52/imgutils.jl b/src/libav/AVUtil/v52/imgutils.jl index b157a457..a0eedd2c 100644 --- a/src/libav/AVUtil/v52/imgutils.jl +++ b/src/libav/AVUtil/v52/imgutils.jl @@ -15,7 +15,7 @@ export function av_image_fill_max_pixsteps(max_pixsteps,max_pixstep_comps,pixdesc) - ccall((:av_image_fill_max_pixsteps,libavutil),Void,(Ptr{Cint},Ptr{Cint},Ptr{AVPixFmtDescriptor}),max_pixsteps,max_pixstep_comps,pixdesc) + ccall((:av_image_fill_max_pixsteps,libavutil),Cvoid,(Ptr{Cint},Ptr{Cint},Ptr{AVPixFmtDescriptor}),max_pixsteps,max_pixstep_comps,pixdesc) end function av_image_get_linesize(pix_fmt::AVPixelFormat,width::Integer,plane::Integer) @@ -35,15 +35,15 @@ function av_image_alloc(pointers,linesizes,w::Integer,h::Integer,pix_fmt::AVPixe end function av_image_copy_plane(dst,dst_linesize::Integer,src,src_linesize::Integer,bytewidth::Integer,height::Integer) - ccall((:av_image_copy_plane,libavutil),Void,(Ptr{UInt8},Cint,Ptr{UInt8},Cint,Cint,Cint),dst,dst_linesize,src,src_linesize,bytewidth,height) + ccall((:av_image_copy_plane,libavutil),Cvoid,(Ptr{UInt8},Cint,Ptr{UInt8},Cint,Cint,Cint),dst,dst_linesize,src,src_linesize,bytewidth,height) end function av_image_copy(dst_data,dst_linesizes,src_data,src_linesizes,pix_fmt::AVPixelFormat,width::Integer,height::Integer) - ccall((:av_image_copy,libavutil),Void,(Ptr{Ptr{UInt8}},Ptr{Cint},Ptr{Ptr{UInt8}},Ptr{Cint},AVPixelFormat,Cint,Cint),dst_data,dst_linesizes,src_data,src_linesizes,pix_fmt,width,height) + ccall((:av_image_copy,libavutil),Cvoid,(Ptr{Ptr{UInt8}},Ptr{Cint},Ptr{Ptr{UInt8}},Ptr{Cint},AVPixelFormat,Cint,Cint),dst_data,dst_linesizes,src_data,src_linesizes,pix_fmt,width,height) end function av_image_check_size(w::Integer,h::Integer,log_offset::Integer,log_ctx) - ccall((:av_image_check_size,libavutil),Cint,(UInt32,UInt32,Cint,Ptr{Void}),w,h,log_offset,log_ctx) + ccall((:av_image_check_size,libavutil),Cint,(UInt32,UInt32,Cint,Ptr{Cvoid}),w,h,log_offset,log_ctx) end function avpriv_set_systematic_pal2(pal,pix_fmt::AVPixelFormat) diff --git a/src/libav/AVUtil/v52/libavutil_h.jl b/src/libav/AVUtil/v52/libavutil_h.jl index 1ac5d0b4..0be401b2 100644 --- a/src/libav/AVUtil/v52/libavutil_h.jl +++ b/src/libav/AVUtil/v52/libavutil_h.jl @@ -502,7 +502,7 @@ struct AVDictionaryEntry value::Ptr{UInt8} end -const AVDictionary=Void +const AVDictionary=Nothing struct AVFifoBuffer buffer::Ptr{UInt8} @@ -544,7 +544,7 @@ struct AVOption help::Ptr{UInt8} offset::Cint _type::AVOptionType - default_val::Void + default_val::Nothing min::Cdouble max::Cdouble flags::Cint @@ -553,13 +553,13 @@ end struct AVClass class_name::Ptr{UInt8} - item_name::Ptr{Void} + item_name::Ptr{Cvoid} option::Ptr{AVOption} version::Cint log_level_offset_offset::Cint parent_log_context_offset::Cint - child_next::Ptr{Void} - child_class_next::Ptr{Void} + child_next::Ptr{Cvoid} + child_class_next::Ptr{Cvoid} end const PIX_FMT_BE = 1 @@ -895,7 +895,7 @@ const LIBAVUTIL_VERSION_MICRO = 0 # Skipping MacroDefinition: FF_API_AUDIOCONVERT ( LIBAVUTIL_VERSION_MAJOR < 53 ) # Skipping MacroDefinition: FF_API_CPU_FLAG_MMX2 ( LIBAVUTIL_VERSION_MAJOR < 53 ) -const AVAudioFifo=Void +const AVAudioFifo=Nothing # Skipping MacroDefinition: DECLARE_ALIGNED ( n , t , v ) t __attribute__ ( ( aligned ( n ) ) ) v # Skipping MacroDefinition: DECLARE_ASM_CONST ( n , t , v ) static const t av_used __attribute__ ( ( aligned ( n ) ) ) v diff --git a/src/libav/AVUtil/v52/log.jl b/src/libav/AVUtil/v52/log.jl index da8c017b..b355c787 100644 --- a/src/libav/AVUtil/v52/log.jl +++ b/src/libav/AVUtil/v52/log.jl @@ -21,11 +21,11 @@ function av_log_get_level() end function av_log_set_level(arg1::Integer) - ccall((:av_log_set_level,libavutil),Void,(Cint,),arg1) + ccall((:av_log_set_level,libavutil),Cvoid,(Cint,),arg1) end function av_log_set_callback(arg1) - ccall((:av_log_set_callback,libavutil),Void,(Ptr{Void},),arg1) + ccall((:av_log_set_callback,libavutil),Cvoid,(Ptr{Cvoid},),arg1) end # function av_log_default_callback(ptr,level::Integer,fmt,vl) @@ -33,9 +33,9 @@ end # end function av_default_item_name(ctx) - ccall((:av_default_item_name,libavutil),Ptr{UInt8},(Ptr{Void},),ctx) + ccall((:av_default_item_name,libavutil),Ptr{UInt8},(Ptr{Cvoid},),ctx) end function av_log_set_flags(arg::Integer) - ccall((:av_log_set_flags,libavutil),Void,(Cint,),arg) + ccall((:av_log_set_flags,libavutil),Cvoid,(Cint,),arg) end diff --git a/src/libav/AVUtil/v52/mem.jl b/src/libav/AVUtil/v52/mem.jl index d555e432..3fc883ae 100644 --- a/src/libav/AVUtil/v52/mem.jl +++ b/src/libav/AVUtil/v52/mem.jl @@ -15,27 +15,27 @@ export function av_malloc(size::Csize_t) - ccall((:av_malloc,libavutil),Ptr{Void},(Csize_t,),size) + ccall((:av_malloc,libavutil),Ptr{Cvoid},(Csize_t,),size) end function av_malloc_array(nmemb::Csize_t,size::Csize_t) - ccall((:av_malloc_array,libavutil),Ptr{Void},(Csize_t,Csize_t),nmemb,size) + ccall((:av_malloc_array,libavutil),Ptr{Cvoid},(Csize_t,Csize_t),nmemb,size) end function av_realloc(ptr,size::Csize_t) - ccall((:av_realloc,libavutil),Ptr{Void},(Ptr{Void},Csize_t),ptr,size) + ccall((:av_realloc,libavutil),Ptr{Cvoid},(Ptr{Cvoid},Csize_t),ptr,size) end function av_free(ptr) - ccall((:av_free,libavutil),Void,(Ptr{Void},),ptr) + ccall((:av_free,libavutil),Cvoid,(Ptr{Cvoid},),ptr) end function av_mallocz(size::Csize_t) - ccall((:av_mallocz,libavutil),Ptr{Void},(Csize_t,),size) + ccall((:av_mallocz,libavutil),Ptr{Cvoid},(Csize_t,),size) end function av_mallocz_array(nmemb::Csize_t,size::Csize_t) - ccall((:av_mallocz_array,libavutil),Ptr{Void},(Csize_t,Csize_t),nmemb,size) + ccall((:av_mallocz_array,libavutil),Ptr{Cvoid},(Csize_t,Csize_t),nmemb,size) end function av_strdup(s) @@ -43,9 +43,9 @@ function av_strdup(s) end function av_freep(ptr) - ccall((:av_freep,libavutil),Void,(Ptr{Void},),ptr) + ccall((:av_freep,libavutil),Cvoid,(Ptr{Cvoid},),ptr) end function av_memcpy_backptr(dst,back::Integer,cnt::Integer) - ccall((:av_memcpy_backptr,libavutil),Void,(Ptr{UInt8},Cint,Cint),dst,back,cnt) + ccall((:av_memcpy_backptr,libavutil),Cvoid,(Ptr{UInt8},Cint,Cint),dst,back,cnt) end diff --git a/src/libav/AVUtil/v52/opt.jl b/src/libav/AVUtil/v52/opt.jl index 1090381d..8d173a9a 100644 --- a/src/libav/AVUtil/v52/opt.jl +++ b/src/libav/AVUtil/v52/opt.jl @@ -32,67 +32,67 @@ export function av_opt_show2(obj,av_log_obj,req_flags::Integer,rej_flags::Integer) - ccall((:av_opt_show2,libavutil),Cint,(Ptr{Void},Ptr{Void},Cint,Cint),obj,av_log_obj,req_flags,rej_flags) + ccall((:av_opt_show2,libavutil),Cint,(Ptr{Cvoid},Ptr{Cvoid},Cint,Cint),obj,av_log_obj,req_flags,rej_flags) end function av_opt_set_defaults(s) - ccall((:av_opt_set_defaults,libavutil),Void,(Ptr{Void},),s) + ccall((:av_opt_set_defaults,libavutil),Cvoid,(Ptr{Cvoid},),s) end function av_set_options_string(ctx,opts,key_val_sep,pairs_sep) - ccall((:av_set_options_string,libavutil),Cint,(Ptr{Void},Ptr{UInt8},Ptr{UInt8},Ptr{UInt8}),ctx,opts,key_val_sep,pairs_sep) + ccall((:av_set_options_string,libavutil),Cint,(Ptr{Cvoid},Ptr{UInt8},Ptr{UInt8},Ptr{UInt8}),ctx,opts,key_val_sep,pairs_sep) end function av_opt_free(obj) - ccall((:av_opt_free,libavutil),Void,(Ptr{Void},),obj) + ccall((:av_opt_free,libavutil),Cvoid,(Ptr{Cvoid},),obj) end function av_opt_flag_is_set(obj,field_name,flag_name) - ccall((:av_opt_flag_is_set,libavutil),Cint,(Ptr{Void},Ptr{UInt8},Ptr{UInt8}),obj,field_name,flag_name) + ccall((:av_opt_flag_is_set,libavutil),Cint,(Ptr{Cvoid},Ptr{UInt8},Ptr{UInt8}),obj,field_name,flag_name) end function av_opt_set_dict(obj,options) - ccall((:av_opt_set_dict,libavutil),Cint,(Ptr{Void},Ptr{Ptr{AVDictionary}}),obj,options) + ccall((:av_opt_set_dict,libavutil),Cint,(Ptr{Cvoid},Ptr{Ptr{AVDictionary}}),obj,options) end function av_opt_eval_flags(obj,o,val,flags_out) - ccall((:av_opt_eval_flags,libavutil),Cint,(Ptr{Void},Ptr{AVOption},Ptr{UInt8},Ptr{Cint}),obj,o,val,flags_out) + ccall((:av_opt_eval_flags,libavutil),Cint,(Ptr{Cvoid},Ptr{AVOption},Ptr{UInt8},Ptr{Cint}),obj,o,val,flags_out) end function av_opt_eval_int(obj,o,val,int_out) - ccall((:av_opt_eval_int,libavutil),Cint,(Ptr{Void},Ptr{AVOption},Ptr{UInt8},Ptr{Cint}),obj,o,val,int_out) + ccall((:av_opt_eval_int,libavutil),Cint,(Ptr{Cvoid},Ptr{AVOption},Ptr{UInt8},Ptr{Cint}),obj,o,val,int_out) end function av_opt_eval_int64(obj,o,val,int64_out) - ccall((:av_opt_eval_int64,libavutil),Cint,(Ptr{Void},Ptr{AVOption},Ptr{UInt8},Ptr{Int64}),obj,o,val,int64_out) + ccall((:av_opt_eval_int64,libavutil),Cint,(Ptr{Cvoid},Ptr{AVOption},Ptr{UInt8},Ptr{Int64}),obj,o,val,int64_out) end function av_opt_eval_float(obj,o,val,float_out) - ccall((:av_opt_eval_float,libavutil),Cint,(Ptr{Void},Ptr{AVOption},Ptr{UInt8},Ptr{Cfloat}),obj,o,val,float_out) + ccall((:av_opt_eval_float,libavutil),Cint,(Ptr{Cvoid},Ptr{AVOption},Ptr{UInt8},Ptr{Cfloat}),obj,o,val,float_out) end function av_opt_eval_double(obj,o,val,double_out) - ccall((:av_opt_eval_double,libavutil),Cint,(Ptr{Void},Ptr{AVOption},Ptr{UInt8},Ptr{Cdouble}),obj,o,val,double_out) + ccall((:av_opt_eval_double,libavutil),Cint,(Ptr{Cvoid},Ptr{AVOption},Ptr{UInt8},Ptr{Cdouble}),obj,o,val,double_out) end function av_opt_eval_q(obj,o,val,q_out) - ccall((:av_opt_eval_q,libavutil),Cint,(Ptr{Void},Ptr{AVOption},Ptr{UInt8},Ptr{AVRational}),obj,o,val,q_out) + ccall((:av_opt_eval_q,libavutil),Cint,(Ptr{Cvoid},Ptr{AVOption},Ptr{UInt8},Ptr{AVRational}),obj,o,val,q_out) end function av_opt_find(obj,name,unit,opt_flags::Integer,search_flags::Integer) - ccall((:av_opt_find,libavutil),Ptr{AVOption},(Ptr{Void},Ptr{UInt8},Ptr{UInt8},Cint,Cint),obj,name,unit,opt_flags,search_flags) + ccall((:av_opt_find,libavutil),Ptr{AVOption},(Ptr{Cvoid},Ptr{UInt8},Ptr{UInt8},Cint,Cint),obj,name,unit,opt_flags,search_flags) end function av_opt_find2(obj,name,unit,opt_flags::Integer,search_flags::Integer,target_obj) - ccall((:av_opt_find2,libavutil),Ptr{AVOption},(Ptr{Void},Ptr{UInt8},Ptr{UInt8},Cint,Cint,Ptr{Ptr{Void}}),obj,name,unit,opt_flags,search_flags,target_obj) + ccall((:av_opt_find2,libavutil),Ptr{AVOption},(Ptr{Cvoid},Ptr{UInt8},Ptr{UInt8},Cint,Cint,Ptr{Ptr{Cvoid}}),obj,name,unit,opt_flags,search_flags,target_obj) end function av_opt_next(obj,prev) - ccall((:av_opt_next,libavutil),Ptr{AVOption},(Ptr{Void},Ptr{AVOption}),obj,prev) + ccall((:av_opt_next,libavutil),Ptr{AVOption},(Ptr{Cvoid},Ptr{AVOption}),obj,prev) end function av_opt_child_next(obj,prev) - ccall((:av_opt_child_next,libavutil),Ptr{Void},(Ptr{Void},Ptr{Void}),obj,prev) + ccall((:av_opt_child_next,libavutil),Ptr{Cvoid},(Ptr{Cvoid},Ptr{Cvoid}),obj,prev) end function av_opt_child_class_next(parent,prev) @@ -100,37 +100,37 @@ function av_opt_child_class_next(parent,prev) end function av_opt_set(obj,name,val,search_flags::Integer) - ccall((:av_opt_set,libavutil),Cint,(Ptr{Void},Ptr{UInt8},Ptr{UInt8},Cint),obj,name,val,search_flags) + ccall((:av_opt_set,libavutil),Cint,(Ptr{Cvoid},Ptr{UInt8},Ptr{UInt8},Cint),obj,name,val,search_flags) end function av_opt_set_int(obj,name,val::Int64,search_flags::Integer) - ccall((:av_opt_set_int,libavutil),Cint,(Ptr{Void},Ptr{UInt8},Int64,Cint),obj,name,val,search_flags) + ccall((:av_opt_set_int,libavutil),Cint,(Ptr{Cvoid},Ptr{UInt8},Int64,Cint),obj,name,val,search_flags) end function av_opt_set_double(obj,name,val::Cdouble,search_flags::Integer) - ccall((:av_opt_set_double,libavutil),Cint,(Ptr{Void},Ptr{UInt8},Cdouble,Cint),obj,name,val,search_flags) + ccall((:av_opt_set_double,libavutil),Cint,(Ptr{Cvoid},Ptr{UInt8},Cdouble,Cint),obj,name,val,search_flags) end function av_opt_set_q(obj,name,val::AVRational,search_flags::Integer) - ccall((:av_opt_set_q,libavutil),Cint,(Ptr{Void},Ptr{UInt8},AVRational,Cint),obj,name,val,search_flags) + ccall((:av_opt_set_q,libavutil),Cint,(Ptr{Cvoid},Ptr{UInt8},AVRational,Cint),obj,name,val,search_flags) end function av_opt_set_bin(obj,name,val,size::Integer,search_flags::Integer) - ccall((:av_opt_set_bin,libavutil),Cint,(Ptr{Void},Ptr{UInt8},Ptr{UInt8},Cint,Cint),obj,name,val,size,search_flags) + ccall((:av_opt_set_bin,libavutil),Cint,(Ptr{Cvoid},Ptr{UInt8},Ptr{UInt8},Cint,Cint),obj,name,val,size,search_flags) end function av_opt_get(obj,name,search_flags::Integer,out_val) - ccall((:av_opt_get,libavutil),Cint,(Ptr{Void},Ptr{UInt8},Cint,Ptr{Ptr{UInt8}}),obj,name,search_flags,out_val) + ccall((:av_opt_get,libavutil),Cint,(Ptr{Cvoid},Ptr{UInt8},Cint,Ptr{Ptr{UInt8}}),obj,name,search_flags,out_val) end function av_opt_get_int(obj,name,search_flags::Integer,out_val) - ccall((:av_opt_get_int,libavutil),Cint,(Ptr{Void},Ptr{UInt8},Cint,Ptr{Int64}),obj,name,search_flags,out_val) + ccall((:av_opt_get_int,libavutil),Cint,(Ptr{Cvoid},Ptr{UInt8},Cint,Ptr{Int64}),obj,name,search_flags,out_val) end function av_opt_get_double(obj,name,search_flags::Integer,out_val) - ccall((:av_opt_get_double,libavutil),Cint,(Ptr{Void},Ptr{UInt8},Cint,Ptr{Cdouble}),obj,name,search_flags,out_val) + ccall((:av_opt_get_double,libavutil),Cint,(Ptr{Cvoid},Ptr{UInt8},Cint,Ptr{Cdouble}),obj,name,search_flags,out_val) end function av_opt_get_q(obj,name,search_flags::Integer,out_val) - ccall((:av_opt_get_q,libavutil),Cint,(Ptr{Void},Ptr{UInt8},Cint,Ptr{AVRational}),obj,name,search_flags,out_val) + ccall((:av_opt_get_q,libavutil),Cint,(Ptr{Cvoid},Ptr{UInt8},Cint,Ptr{AVRational}),obj,name,search_flags,out_val) end diff --git a/src/libav/AVUtil/v52/pixdesc.jl b/src/libav/AVUtil/v52/pixdesc.jl index 97d39141..acfe02c5 100644 --- a/src/libav/AVUtil/v52/pixdesc.jl +++ b/src/libav/AVUtil/v52/pixdesc.jl @@ -16,11 +16,11 @@ export function av_read_image_line(dst,data,linesize,desc,x::Integer,y::Integer,c::Integer,w::Integer,read_pal_component::Integer) - ccall((:av_read_image_line,libavutil),Void,(Ptr{UInt16},Ptr{Ptr{UInt8}},Ptr{Cint},Ptr{AVPixFmtDescriptor},Cint,Cint,Cint,Cint,Cint),dst,data,linesize,desc,x,y,c,w,read_pal_component) + ccall((:av_read_image_line,libavutil),Cvoid,(Ptr{UInt16},Ptr{Ptr{UInt8}},Ptr{Cint},Ptr{AVPixFmtDescriptor},Cint,Cint,Cint,Cint,Cint),dst,data,linesize,desc,x,y,c,w,read_pal_component) end function av_write_image_line(src,data,linesize,desc,x::Integer,y::Integer,c::Integer,w::Integer) - ccall((:av_write_image_line,libavutil),Void,(Ptr{UInt16},Ptr{Ptr{UInt8}},Ptr{Cint},Ptr{AVPixFmtDescriptor},Cint,Cint,Cint,Cint),src,data,linesize,desc,x,y,c,w) + ccall((:av_write_image_line,libavutil),Cvoid,(Ptr{UInt16},Ptr{Ptr{UInt8}},Ptr{Cint},Ptr{AVPixFmtDescriptor},Cint,Cint,Cint,Cint),src,data,linesize,desc,x,y,c,w) end function av_get_pix_fmt(name) diff --git a/src/libav/AVUtil/v52/xtea.jl b/src/libav/AVUtil/v52/xtea.jl index 83c96ddb..063db244 100644 --- a/src/libav/AVUtil/v52/xtea.jl +++ b/src/libav/AVUtil/v52/xtea.jl @@ -8,9 +8,9 @@ export function av_xtea_init(ctx,key) - ccall((:av_xtea_init,libavutil),Void,(Ptr{AVXTEA},Ptr{UInt8}),ctx,key) + ccall((:av_xtea_init,libavutil),Cvoid,(Ptr{AVXTEA},Ptr{UInt8}),ctx,key) end function av_xtea_crypt(ctx,dst,src,count::Integer,iv,decrypt::Integer) - ccall((:av_xtea_crypt,libavutil),Void,(Ptr{AVXTEA},Ptr{UInt8},Ptr{UInt8},Cint,Ptr{UInt8},Cint),ctx,dst,src,count,iv,decrypt) + ccall((:av_xtea_crypt,libavutil),Cvoid,(Ptr{AVXTEA},Ptr{UInt8},Ptr{UInt8},Cint,Ptr{UInt8},Cint),ctx,dst,src,count,iv,decrypt) end diff --git a/src/libav/AVUtil/v53/audio_fifo.jl b/src/libav/AVUtil/v53/audio_fifo.jl index 787dcc18..c0ca265d 100644 --- a/src/libav/AVUtil/v53/audio_fifo.jl +++ b/src/libav/AVUtil/v53/audio_fifo.jl @@ -15,7 +15,7 @@ export function av_audio_fifo_free(af) - ccall((:av_audio_fifo_free,libavutil),Void,(Ptr{AVAudioFifo},),af) + ccall((:av_audio_fifo_free,libavutil),Cvoid,(Ptr{AVAudioFifo},),af) end function av_audio_fifo_alloc(sample_fmt::AVSampleFormat,channels::Integer,nb_samples::Integer) @@ -27,11 +27,11 @@ function av_audio_fifo_realloc(af,nb_samples::Integer) end function av_audio_fifo_write(af,data,nb_samples::Integer) - ccall((:av_audio_fifo_write,libavutil),Cint,(Ptr{AVAudioFifo},Ptr{Ptr{Void}},Cint),af,data,nb_samples) + ccall((:av_audio_fifo_write,libavutil),Cint,(Ptr{AVAudioFifo},Ptr{Ptr{Cvoid}},Cint),af,data,nb_samples) end function av_audio_fifo_read(af,data,nb_samples::Integer) - ccall((:av_audio_fifo_read,libavutil),Cint,(Ptr{AVAudioFifo},Ptr{Ptr{Void}},Cint),af,data,nb_samples) + ccall((:av_audio_fifo_read,libavutil),Cint,(Ptr{AVAudioFifo},Ptr{Ptr{Cvoid}},Cint),af,data,nb_samples) end function av_audio_fifo_drain(af,nb_samples::Integer) @@ -39,7 +39,7 @@ function av_audio_fifo_drain(af,nb_samples::Integer) end function av_audio_fifo_reset(af) - ccall((:av_audio_fifo_reset,libavutil),Void,(Ptr{AVAudioFifo},),af) + ccall((:av_audio_fifo_reset,libavutil),Cvoid,(Ptr{AVAudioFifo},),af) end function av_audio_fifo_size(af) diff --git a/src/libav/AVUtil/v53/buffer.jl b/src/libav/AVUtil/v53/buffer.jl index 6104d232..baa262f7 100644 --- a/src/libav/AVUtil/v53/buffer.jl +++ b/src/libav/AVUtil/v53/buffer.jl @@ -26,11 +26,11 @@ function av_buffer_allocz(size::Integer) end function av_buffer_create(data,size::Integer,free,opaque,flags::Integer) - ccall((:av_buffer_create,libavutil),Ptr{AVBufferRef},(Ptr{UInt8},Cint,Ptr{Void},Ptr{Void},Cint),data,size,free,opaque,flags) + ccall((:av_buffer_create,libavutil),Ptr{AVBufferRef},(Ptr{UInt8},Cint,Ptr{Cvoid},Ptr{Cvoid},Cint),data,size,free,opaque,flags) end function av_buffer_default_free(opaque,data) - ccall((:av_buffer_default_free,libavutil),Void,(Ptr{Void},Ptr{UInt8}),opaque,data) + ccall((:av_buffer_default_free,libavutil),Cvoid,(Ptr{Cvoid},Ptr{UInt8}),opaque,data) end function av_buffer_ref(buf) @@ -38,7 +38,7 @@ function av_buffer_ref(buf) end function av_buffer_unref(buf) - ccall((:av_buffer_unref,libavutil),Void,(Ptr{Ptr{AVBufferRef}},),buf) + ccall((:av_buffer_unref,libavutil),Cvoid,(Ptr{Ptr{AVBufferRef}},),buf) end function av_buffer_is_writable(buf) @@ -54,11 +54,11 @@ function av_buffer_realloc(buf,size::Integer) end function av_buffer_pool_init(size::Integer,alloc) - ccall((:av_buffer_pool_init,libavutil),Ptr{AVBufferPool},(Cint,Ptr{Void}),size,alloc) + ccall((:av_buffer_pool_init,libavutil),Ptr{AVBufferPool},(Cint,Ptr{Cvoid}),size,alloc) end function av_buffer_pool_uninit(pool) - ccall((:av_buffer_pool_uninit,libavutil),Void,(Ptr{Ptr{AVBufferPool}},),pool) + ccall((:av_buffer_pool_uninit,libavutil),Cvoid,(Ptr{Ptr{AVBufferPool}},),pool) end function av_buffer_pool_get(pool) diff --git a/src/libav/AVUtil/v53/channel_layout.jl b/src/libav/AVUtil/v53/channel_layout.jl index 53840c5a..6e9d817d 100644 --- a/src/libav/AVUtil/v53/channel_layout.jl +++ b/src/libav/AVUtil/v53/channel_layout.jl @@ -17,7 +17,7 @@ function av_get_channel_layout(name) end function av_get_channel_layout_string(buf,buf_size::Integer,nb_channels::Integer,channel_layout::UInt64) - ccall((:av_get_channel_layout_string,libavutil),Void,(Ptr{UInt8},Cint,Cint,UInt64),buf,buf_size,nb_channels,channel_layout) + ccall((:av_get_channel_layout_string,libavutil),Cvoid,(Ptr{UInt8},Cint,Cint,UInt64),buf,buf_size,nb_channels,channel_layout) end function av_get_channel_layout_nb_channels(channel_layout::UInt64) diff --git a/src/libav/AVUtil/v53/dict.jl b/src/libav/AVUtil/v53/dict.jl index 96cdfe41..7dd3df81 100644 --- a/src/libav/AVUtil/v53/dict.jl +++ b/src/libav/AVUtil/v53/dict.jl @@ -28,9 +28,9 @@ function av_dict_parse_string(pm,str,key_val_sep,pairs_sep,flags::Integer) end function av_dict_copy(dst,src,flags::Integer) - ccall((:av_dict_copy,libavutil),Void,(Ptr{Ptr{AVDictionary}},Ptr{AVDictionary},Cint),dst,src,flags) + ccall((:av_dict_copy,libavutil),Cvoid,(Ptr{Ptr{AVDictionary}},Ptr{AVDictionary},Cint),dst,src,flags) end function av_dict_free(m) - ccall((:av_dict_free,libavutil),Void,(Ptr{Ptr{AVDictionary}},),m) + ccall((:av_dict_free,libavutil),Cvoid,(Ptr{Ptr{AVDictionary}},),m) end diff --git a/src/libav/AVUtil/v53/fifo.jl b/src/libav/AVUtil/v53/fifo.jl index 4e419c7a..004738c1 100644 --- a/src/libav/AVUtil/v53/fifo.jl +++ b/src/libav/AVUtil/v53/fifo.jl @@ -20,11 +20,11 @@ function av_fifo_alloc(size::Integer) end function av_fifo_free(f) - ccall((:av_fifo_free,libavutil),Void,(Ptr{AVFifoBuffer},),f) + ccall((:av_fifo_free,libavutil),Cvoid,(Ptr{AVFifoBuffer},),f) end function av_fifo_reset(f) - ccall((:av_fifo_reset,libavutil),Void,(Ptr{AVFifoBuffer},),f) + ccall((:av_fifo_reset,libavutil),Cvoid,(Ptr{AVFifoBuffer},),f) end function av_fifo_size(f) @@ -36,11 +36,11 @@ function av_fifo_space(f) end function av_fifo_generic_read(f,dest,buf_size::Integer,func) - ccall((:av_fifo_generic_read,libavutil),Cint,(Ptr{AVFifoBuffer},Ptr{Void},Cint,Ptr{Void}),f,dest,buf_size,func) + ccall((:av_fifo_generic_read,libavutil),Cint,(Ptr{AVFifoBuffer},Ptr{Cvoid},Cint,Ptr{Cvoid}),f,dest,buf_size,func) end function av_fifo_generic_write(f,src,size::Integer,func) - ccall((:av_fifo_generic_write,libavutil),Cint,(Ptr{AVFifoBuffer},Ptr{Void},Cint,Ptr{Void}),f,src,size,func) + ccall((:av_fifo_generic_write,libavutil),Cint,(Ptr{AVFifoBuffer},Ptr{Cvoid},Cint,Ptr{Cvoid}),f,src,size,func) end function av_fifo_realloc2(f,size::Integer) @@ -48,7 +48,7 @@ function av_fifo_realloc2(f,size::Integer) end function av_fifo_drain(f,size::Integer) - ccall((:av_fifo_drain,libavutil),Void,(Ptr{AVFifoBuffer},Cint),f,size) + ccall((:av_fifo_drain,libavutil),Cvoid,(Ptr{AVFifoBuffer},Cint),f,size) end function av_fifo_peek2(f,offs::Integer) diff --git a/src/libav/AVUtil/v53/file.jl b/src/libav/AVUtil/v53/file.jl index 3f4ef293..5bd301fc 100644 --- a/src/libav/AVUtil/v53/file.jl +++ b/src/libav/AVUtil/v53/file.jl @@ -8,9 +8,9 @@ export function av_file_map(filename,bufptr,size,log_offset::Integer,log_ctx) - ccall((:av_file_map,libavutil),Cint,(Ptr{UInt8},Ptr{Ptr{UInt8}},Ptr{Csize_t},Cint,Ptr{Void}),filename,bufptr,size,log_offset,log_ctx) + ccall((:av_file_map,libavutil),Cint,(Ptr{UInt8},Ptr{Ptr{UInt8}},Ptr{Csize_t},Cint,Ptr{Cvoid}),filename,bufptr,size,log_offset,log_ctx) end function av_file_unmap(bufptr,size::Csize_t) - ccall((:av_file_unmap,libavutil),Void,(Ptr{UInt8},Csize_t),bufptr,size) + ccall((:av_file_unmap,libavutil),Cvoid,(Ptr{UInt8},Csize_t),bufptr,size) end diff --git a/src/libav/AVUtil/v53/frame.jl b/src/libav/AVUtil/v53/frame.jl index 71f69f0d..c3be103c 100644 --- a/src/libav/AVUtil/v53/frame.jl +++ b/src/libav/AVUtil/v53/frame.jl @@ -23,7 +23,7 @@ function av_frame_alloc() end function av_frame_free(frame) - ccall((:av_frame_free,libavutil),Void,(Ptr{Ptr{AVFrame}},),frame) + ccall((:av_frame_free,libavutil),Cvoid,(Ptr{Ptr{AVFrame}},),frame) end function av_frame_ref(dst,src) @@ -35,11 +35,11 @@ function av_frame_clone(src) end function av_frame_unref(frame) - ccall((:av_frame_unref,libavutil),Void,(Ptr{AVFrame},),frame) + ccall((:av_frame_unref,libavutil),Cvoid,(Ptr{AVFrame},),frame) end function av_frame_move_ref(dst,src) - ccall((:av_frame_move_ref,libavutil),Void,(Ptr{AVFrame},Ptr{AVFrame}),dst,src) + ccall((:av_frame_move_ref,libavutil),Cvoid,(Ptr{AVFrame},Ptr{AVFrame}),dst,src) end function av_frame_get_buffer(frame,align::Integer) diff --git a/src/libav/AVUtil/v53/imgutils.jl b/src/libav/AVUtil/v53/imgutils.jl index 83f7c648..881fa1be 100644 --- a/src/libav/AVUtil/v53/imgutils.jl +++ b/src/libav/AVUtil/v53/imgutils.jl @@ -15,7 +15,7 @@ export function av_image_fill_max_pixsteps(max_pixsteps,max_pixstep_comps,pixdesc) - ccall((:av_image_fill_max_pixsteps,libavutil),Void,(Ptr{Cint},Ptr{Cint},Ptr{AVPixFmtDescriptor}),max_pixsteps,max_pixstep_comps,pixdesc) + ccall((:av_image_fill_max_pixsteps,libavutil),Cvoid,(Ptr{Cint},Ptr{Cint},Ptr{AVPixFmtDescriptor}),max_pixsteps,max_pixstep_comps,pixdesc) end function av_image_get_linesize(pix_fmt::AVPixelFormat,width::Integer,plane::Integer) @@ -35,15 +35,15 @@ function av_image_alloc(pointers,linesizes,w::Integer,h::Integer,pix_fmt::AVPixe end function av_image_copy_plane(dst,dst_linesize::Integer,src,src_linesize::Integer,bytewidth::Integer,height::Integer) - ccall((:av_image_copy_plane,libavutil),Void,(Ptr{UInt8},Cint,Ptr{UInt8},Cint,Cint,Cint),dst,dst_linesize,src,src_linesize,bytewidth,height) + ccall((:av_image_copy_plane,libavutil),Cvoid,(Ptr{UInt8},Cint,Ptr{UInt8},Cint,Cint,Cint),dst,dst_linesize,src,src_linesize,bytewidth,height) end function av_image_copy(dst_data,dst_linesizes,src_data,src_linesizes,pix_fmt::AVPixelFormat,width::Integer,height::Integer) - ccall((:av_image_copy,libavutil),Void,(Ptr{Ptr{UInt8}},Ptr{Cint},Ptr{Ptr{UInt8}},Ptr{Cint},AVPixelFormat,Cint,Cint),dst_data,dst_linesizes,src_data,src_linesizes,pix_fmt,width,height) + ccall((:av_image_copy,libavutil),Cvoid,(Ptr{Ptr{UInt8}},Ptr{Cint},Ptr{Ptr{UInt8}},Ptr{Cint},AVPixelFormat,Cint,Cint),dst_data,dst_linesizes,src_data,src_linesizes,pix_fmt,width,height) end function av_image_check_size(w::Integer,h::Integer,log_offset::Integer,log_ctx) - ccall((:av_image_check_size,libavutil),Cint,(UInt32,UInt32,Cint,Ptr{Void}),w,h,log_offset,log_ctx) + ccall((:av_image_check_size,libavutil),Cint,(UInt32,UInt32,Cint,Ptr{Cvoid}),w,h,log_offset,log_ctx) end function avpriv_set_systematic_pal2(pal,pix_fmt::AVPixelFormat) diff --git a/src/libav/AVUtil/v53/libavutil_h.jl b/src/libav/AVUtil/v53/libavutil_h.jl index a374f68a..739ca939 100644 --- a/src/libav/AVUtil/v53/libavutil_h.jl +++ b/src/libav/AVUtil/v53/libavutil_h.jl @@ -474,7 +474,7 @@ const AV_PICTURE_TYPE_BI = UInt32(7) const AV_BUFFER_FLAG_READONLY = 1 << 0 -const AVBuffer=Void +const AVBuffer=Nothing struct AVBufferRef buffer::Ptr{AVBuffer} @@ -482,7 +482,7 @@ struct AVBufferRef size::Cint end -const AVBufferPool=Void +const AVBufferPool=Nothing const AV_CH_FRONT_LEFT = 0x00000001 const AV_CH_FRONT_RIGHT = 0x00000002 @@ -562,7 +562,7 @@ struct AVDictionaryEntry value::Ptr{UInt8} end -const AVDictionary=Void +const AVDictionary=Nothing struct AVFifoBuffer buffer::Ptr{UInt8} @@ -619,8 +619,8 @@ end zero(::Type{Array_8_Cint}) = Array_8_Cint(fill(zero(Cint),8)...) struct Array_2_Ptr - d1::Ptr{Void} - d2::Ptr{Void} + d1::Ptr{Cvoid} + d2::Ptr{Cvoid} end zero(::Type{Array_2_Ptr}) = Array_2_Ptr(fill(C_NULL,2)...) @@ -665,7 +665,7 @@ struct AVFrame mb_type::Ptr{UInt32} dct_coeff::Ptr{Int16} ref_index::Array_2_Ptr - opaque::Ptr{Void} + opaque::Ptr{Cvoid} error::Array_8_Uint64 _type::Cint repeat_pict::Cint @@ -673,11 +673,11 @@ struct AVFrame top_field_first::Cint palette_has_changed::Cint buffer_hints::Cint - pan_scan::Ptr{Void} #Ptr{AVPanScan} + pan_scan::Ptr{Cvoid} #Ptr{AVPanScan} reordered_opaque::Int64 - hwaccel_picture_private::Ptr{Void} - owner::Ptr{Void} #Ptr{AVCodecContext} - thread_opaque::Ptr{Void} + hwaccel_picture_private::Ptr{Cvoid} + owner::Ptr{Cvoid} #Ptr{AVCodecContext} + thread_opaque::Ptr{Cvoid} motion_subsample_log2::UInt8 sample_rate::Cint channel_layout::UInt64 @@ -720,7 +720,7 @@ struct AVOption help::Ptr{UInt8} offset::Cint _type::AVOptionType - default_val::Void + default_val::Nothing min::Cdouble max::Cdouble flags::Cint @@ -729,13 +729,13 @@ end struct AVClass class_name::Ptr{UInt8} - item_name::Ptr{Void} + item_name::Ptr{Cvoid} option::Ptr{AVOption} version::Cint log_level_offset_offset::Cint parent_log_context_offset::Cint - child_next::Ptr{Void} - child_class_next::Ptr{Void} + child_next::Ptr{Cvoid} + child_class_next::Ptr{Cvoid} end const AV_PIX_FMT_FLAG_BE = 1 << 0 @@ -1094,7 +1094,7 @@ const LIBAVUTIL_VERSION_MICRO = 0 # Skipping MacroDefinition: FF_API_VDPAU ( LIBAVUTIL_VERSION_MAJOR < 54 ) # Skipping MacroDefinition: FF_API_XVMC ( LIBAVUTIL_VERSION_MAJOR < 54 ) -const AVAudioFifo=Void +const AVAudioFifo=Nothing # begin enum AVDownmixType const AVDownmixType=UInt32 diff --git a/src/libav/AVUtil/v53/log.jl b/src/libav/AVUtil/v53/log.jl index 4507f374..5114dd1b 100644 --- a/src/libav/AVUtil/v53/log.jl +++ b/src/libav/AVUtil/v53/log.jl @@ -21,11 +21,11 @@ function av_log_get_level() end function av_log_set_level(level::Integer) - ccall((:av_log_set_level,libavutil),Void,(Cint,),level) + ccall((:av_log_set_level,libavutil),Cvoid,(Cint,),level) end function av_log_set_callback(callback) - ccall((:av_log_set_callback,libavutil),Void,(Ptr{Void},),callback) + ccall((:av_log_set_callback,libavutil),Cvoid,(Ptr{Cvoid},),callback) end # function av_log_default_callback(avcl,level::Integer,fmt,vl) @@ -33,9 +33,9 @@ end # end function av_default_item_name(ctx) - ccall((:av_default_item_name,libavutil),Ptr{UInt8},(Ptr{Void},),ctx) + ccall((:av_default_item_name,libavutil),Ptr{UInt8},(Ptr{Cvoid},),ctx) end function av_log_set_flags(arg::Integer) - ccall((:av_log_set_flags,libavutil),Void,(Cint,),arg) + ccall((:av_log_set_flags,libavutil),Cvoid,(Cint,),arg) end diff --git a/src/libav/AVUtil/v53/mem.jl b/src/libav/AVUtil/v53/mem.jl index 81e493a2..4a874358 100644 --- a/src/libav/AVUtil/v53/mem.jl +++ b/src/libav/AVUtil/v53/mem.jl @@ -20,39 +20,39 @@ export function av_malloc(size::Csize_t) - ccall((:av_malloc,libavutil),Ptr{Void},(Csize_t,),size) + ccall((:av_malloc,libavutil),Ptr{Cvoid},(Csize_t,),size) end function av_malloc_array(nmemb::Csize_t,size::Csize_t) - ccall((:av_malloc_array,libavutil),Ptr{Void},(Csize_t,Csize_t),nmemb,size) + ccall((:av_malloc_array,libavutil),Ptr{Cvoid},(Csize_t,Csize_t),nmemb,size) end function av_realloc(ptr,size::Csize_t) - ccall((:av_realloc,libavutil),Ptr{Void},(Ptr{Void},Csize_t),ptr,size) + ccall((:av_realloc,libavutil),Ptr{Cvoid},(Ptr{Cvoid},Csize_t),ptr,size) end function av_reallocp(ptr,size::Csize_t) - ccall((:av_reallocp,libavutil),Cint,(Ptr{Void},Csize_t),ptr,size) + ccall((:av_reallocp,libavutil),Cint,(Ptr{Cvoid},Csize_t),ptr,size) end function av_realloc_array(ptr,nmemb::Csize_t,size::Csize_t) - ccall((:av_realloc_array,libavutil),Ptr{Void},(Ptr{Void},Csize_t,Csize_t),ptr,nmemb,size) + ccall((:av_realloc_array,libavutil),Ptr{Cvoid},(Ptr{Cvoid},Csize_t,Csize_t),ptr,nmemb,size) end function av_reallocp_array(ptr,nmemb::Csize_t,size::Csize_t) - ccall((:av_reallocp_array,libavutil),Cint,(Ptr{Void},Csize_t,Csize_t),ptr,nmemb,size) + ccall((:av_reallocp_array,libavutil),Cint,(Ptr{Cvoid},Csize_t,Csize_t),ptr,nmemb,size) end function av_free(ptr) - ccall((:av_free,libavutil),Void,(Ptr{Void},),ptr) + ccall((:av_free,libavutil),Cvoid,(Ptr{Cvoid},),ptr) end function av_mallocz(size::Csize_t) - ccall((:av_mallocz,libavutil),Ptr{Void},(Csize_t,),size) + ccall((:av_mallocz,libavutil),Ptr{Cvoid},(Csize_t,),size) end function av_mallocz_array(nmemb::Csize_t,size::Csize_t) - ccall((:av_mallocz_array,libavutil),Ptr{Void},(Csize_t,Csize_t),nmemb,size) + ccall((:av_mallocz_array,libavutil),Ptr{Cvoid},(Csize_t,Csize_t),nmemb,size) end function av_strdup(s) @@ -60,17 +60,17 @@ function av_strdup(s) end function av_freep(ptr) - ccall((:av_freep,libavutil),Void,(Ptr{Void},),ptr) + ccall((:av_freep,libavutil),Cvoid,(Ptr{Cvoid},),ptr) end function av_memcpy_backptr(dst,back::Integer,cnt::Integer) - ccall((:av_memcpy_backptr,libavutil),Void,(Ptr{UInt8},Cint,Cint),dst,back,cnt) + ccall((:av_memcpy_backptr,libavutil),Cvoid,(Ptr{UInt8},Cint,Cint),dst,back,cnt) end function av_fast_realloc(ptr,size,min_size::Csize_t) - ccall((:av_fast_realloc,libavutil),Ptr{Void},(Ptr{Void},Ptr{UInt32},Csize_t),ptr,size,min_size) + ccall((:av_fast_realloc,libavutil),Ptr{Cvoid},(Ptr{Cvoid},Ptr{UInt32},Csize_t),ptr,size,min_size) end function av_fast_malloc(ptr,size,min_size::Csize_t) - ccall((:av_fast_malloc,libavutil),Void,(Ptr{Void},Ptr{UInt32},Csize_t),ptr,size,min_size) + ccall((:av_fast_malloc,libavutil),Cvoid,(Ptr{Cvoid},Ptr{UInt32},Csize_t),ptr,size,min_size) end diff --git a/src/libav/AVUtil/v53/opt.jl b/src/libav/AVUtil/v53/opt.jl index 0a000a98..b709941e 100644 --- a/src/libav/AVUtil/v53/opt.jl +++ b/src/libav/AVUtil/v53/opt.jl @@ -32,67 +32,67 @@ export function av_opt_show2(obj,av_log_obj,req_flags::Integer,rej_flags::Integer) - ccall((:av_opt_show2,libavutil),Cint,(Ptr{Void},Ptr{Void},Cint,Cint),obj,av_log_obj,req_flags,rej_flags) + ccall((:av_opt_show2,libavutil),Cint,(Ptr{Cvoid},Ptr{Cvoid},Cint,Cint),obj,av_log_obj,req_flags,rej_flags) end function av_opt_set_defaults(s) - ccall((:av_opt_set_defaults,libavutil),Void,(Ptr{Void},),s) + ccall((:av_opt_set_defaults,libavutil),Cvoid,(Ptr{Cvoid},),s) end function av_set_options_string(ctx,opts,key_val_sep,pairs_sep) - ccall((:av_set_options_string,libavutil),Cint,(Ptr{Void},Ptr{UInt8},Ptr{UInt8},Ptr{UInt8}),ctx,opts,key_val_sep,pairs_sep) + ccall((:av_set_options_string,libavutil),Cint,(Ptr{Cvoid},Ptr{UInt8},Ptr{UInt8},Ptr{UInt8}),ctx,opts,key_val_sep,pairs_sep) end function av_opt_free(obj) - ccall((:av_opt_free,libavutil),Void,(Ptr{Void},),obj) + ccall((:av_opt_free,libavutil),Cvoid,(Ptr{Cvoid},),obj) end function av_opt_flag_is_set(obj,field_name,flag_name) - ccall((:av_opt_flag_is_set,libavutil),Cint,(Ptr{Void},Ptr{UInt8},Ptr{UInt8}),obj,field_name,flag_name) + ccall((:av_opt_flag_is_set,libavutil),Cint,(Ptr{Cvoid},Ptr{UInt8},Ptr{UInt8}),obj,field_name,flag_name) end function av_opt_set_dict(obj,options) - ccall((:av_opt_set_dict,libavutil),Cint,(Ptr{Void},Ptr{Ptr{AVDictionary}}),obj,options) + ccall((:av_opt_set_dict,libavutil),Cint,(Ptr{Cvoid},Ptr{Ptr{AVDictionary}}),obj,options) end function av_opt_eval_flags(obj,o,val,flags_out) - ccall((:av_opt_eval_flags,libavutil),Cint,(Ptr{Void},Ptr{AVOption},Ptr{UInt8},Ptr{Cint}),obj,o,val,flags_out) + ccall((:av_opt_eval_flags,libavutil),Cint,(Ptr{Cvoid},Ptr{AVOption},Ptr{UInt8},Ptr{Cint}),obj,o,val,flags_out) end function av_opt_eval_int(obj,o,val,int_out) - ccall((:av_opt_eval_int,libavutil),Cint,(Ptr{Void},Ptr{AVOption},Ptr{UInt8},Ptr{Cint}),obj,o,val,int_out) + ccall((:av_opt_eval_int,libavutil),Cint,(Ptr{Cvoid},Ptr{AVOption},Ptr{UInt8},Ptr{Cint}),obj,o,val,int_out) end function av_opt_eval_int64(obj,o,val,int64_out) - ccall((:av_opt_eval_int64,libavutil),Cint,(Ptr{Void},Ptr{AVOption},Ptr{UInt8},Ptr{Int64}),obj,o,val,int64_out) + ccall((:av_opt_eval_int64,libavutil),Cint,(Ptr{Cvoid},Ptr{AVOption},Ptr{UInt8},Ptr{Int64}),obj,o,val,int64_out) end function av_opt_eval_float(obj,o,val,float_out) - ccall((:av_opt_eval_float,libavutil),Cint,(Ptr{Void},Ptr{AVOption},Ptr{UInt8},Ptr{Cfloat}),obj,o,val,float_out) + ccall((:av_opt_eval_float,libavutil),Cint,(Ptr{Cvoid},Ptr{AVOption},Ptr{UInt8},Ptr{Cfloat}),obj,o,val,float_out) end function av_opt_eval_double(obj,o,val,double_out) - ccall((:av_opt_eval_double,libavutil),Cint,(Ptr{Void},Ptr{AVOption},Ptr{UInt8},Ptr{Cdouble}),obj,o,val,double_out) + ccall((:av_opt_eval_double,libavutil),Cint,(Ptr{Cvoid},Ptr{AVOption},Ptr{UInt8},Ptr{Cdouble}),obj,o,val,double_out) end function av_opt_eval_q(obj,o,val,q_out) - ccall((:av_opt_eval_q,libavutil),Cint,(Ptr{Void},Ptr{AVOption},Ptr{UInt8},Ptr{AVRational}),obj,o,val,q_out) + ccall((:av_opt_eval_q,libavutil),Cint,(Ptr{Cvoid},Ptr{AVOption},Ptr{UInt8},Ptr{AVRational}),obj,o,val,q_out) end function av_opt_find(obj,name,unit,opt_flags::Integer,search_flags::Integer) - ccall((:av_opt_find,libavutil),Ptr{AVOption},(Ptr{Void},Ptr{UInt8},Ptr{UInt8},Cint,Cint),obj,name,unit,opt_flags,search_flags) + ccall((:av_opt_find,libavutil),Ptr{AVOption},(Ptr{Cvoid},Ptr{UInt8},Ptr{UInt8},Cint,Cint),obj,name,unit,opt_flags,search_flags) end function av_opt_find2(obj,name,unit,opt_flags::Integer,search_flags::Integer,target_obj) - ccall((:av_opt_find2,libavutil),Ptr{AVOption},(Ptr{Void},Ptr{UInt8},Ptr{UInt8},Cint,Cint,Ptr{Ptr{Void}}),obj,name,unit,opt_flags,search_flags,target_obj) + ccall((:av_opt_find2,libavutil),Ptr{AVOption},(Ptr{Cvoid},Ptr{UInt8},Ptr{UInt8},Cint,Cint,Ptr{Ptr{Cvoid}}),obj,name,unit,opt_flags,search_flags,target_obj) end function av_opt_next(obj,prev) - ccall((:av_opt_next,libavutil),Ptr{AVOption},(Ptr{Void},Ptr{AVOption}),obj,prev) + ccall((:av_opt_next,libavutil),Ptr{AVOption},(Ptr{Cvoid},Ptr{AVOption}),obj,prev) end function av_opt_child_next(obj,prev) - ccall((:av_opt_child_next,libavutil),Ptr{Void},(Ptr{Void},Ptr{Void}),obj,prev) + ccall((:av_opt_child_next,libavutil),Ptr{Cvoid},(Ptr{Cvoid},Ptr{Cvoid}),obj,prev) end function av_opt_child_class_next(parent,prev) @@ -100,37 +100,37 @@ function av_opt_child_class_next(parent,prev) end function av_opt_set(obj,name,val,search_flags::Integer) - ccall((:av_opt_set,libavutil),Cint,(Ptr{Void},Ptr{UInt8},Ptr{UInt8},Cint),obj,name,val,search_flags) + ccall((:av_opt_set,libavutil),Cint,(Ptr{Cvoid},Ptr{UInt8},Ptr{UInt8},Cint),obj,name,val,search_flags) end function av_opt_set_int(obj,name,val::Int64,search_flags::Integer) - ccall((:av_opt_set_int,libavutil),Cint,(Ptr{Void},Ptr{UInt8},Int64,Cint),obj,name,val,search_flags) + ccall((:av_opt_set_int,libavutil),Cint,(Ptr{Cvoid},Ptr{UInt8},Int64,Cint),obj,name,val,search_flags) end function av_opt_set_double(obj,name,val::Cdouble,search_flags::Integer) - ccall((:av_opt_set_double,libavutil),Cint,(Ptr{Void},Ptr{UInt8},Cdouble,Cint),obj,name,val,search_flags) + ccall((:av_opt_set_double,libavutil),Cint,(Ptr{Cvoid},Ptr{UInt8},Cdouble,Cint),obj,name,val,search_flags) end function av_opt_set_q(obj,name,val::AVRational,search_flags::Integer) - ccall((:av_opt_set_q,libavutil),Cint,(Ptr{Void},Ptr{UInt8},AVRational,Cint),obj,name,val,search_flags) + ccall((:av_opt_set_q,libavutil),Cint,(Ptr{Cvoid},Ptr{UInt8},AVRational,Cint),obj,name,val,search_flags) end function av_opt_set_bin(obj,name,val,size::Integer,search_flags::Integer) - ccall((:av_opt_set_bin,libavutil),Cint,(Ptr{Void},Ptr{UInt8},Ptr{UInt8},Cint,Cint),obj,name,val,size,search_flags) + ccall((:av_opt_set_bin,libavutil),Cint,(Ptr{Cvoid},Ptr{UInt8},Ptr{UInt8},Cint,Cint),obj,name,val,size,search_flags) end function av_opt_get(obj,name,search_flags::Integer,out_val) - ccall((:av_opt_get,libavutil),Cint,(Ptr{Void},Ptr{UInt8},Cint,Ptr{Ptr{UInt8}}),obj,name,search_flags,out_val) + ccall((:av_opt_get,libavutil),Cint,(Ptr{Cvoid},Ptr{UInt8},Cint,Ptr{Ptr{UInt8}}),obj,name,search_flags,out_val) end function av_opt_get_int(obj,name,search_flags::Integer,out_val) - ccall((:av_opt_get_int,libavutil),Cint,(Ptr{Void},Ptr{UInt8},Cint,Ptr{Int64}),obj,name,search_flags,out_val) + ccall((:av_opt_get_int,libavutil),Cint,(Ptr{Cvoid},Ptr{UInt8},Cint,Ptr{Int64}),obj,name,search_flags,out_val) end function av_opt_get_double(obj,name,search_flags::Integer,out_val) - ccall((:av_opt_get_double,libavutil),Cint,(Ptr{Void},Ptr{UInt8},Cint,Ptr{Cdouble}),obj,name,search_flags,out_val) + ccall((:av_opt_get_double,libavutil),Cint,(Ptr{Cvoid},Ptr{UInt8},Cint,Ptr{Cdouble}),obj,name,search_flags,out_val) end function av_opt_get_q(obj,name,search_flags::Integer,out_val) - ccall((:av_opt_get_q,libavutil),Cint,(Ptr{Void},Ptr{UInt8},Cint,Ptr{AVRational}),obj,name,search_flags,out_val) + ccall((:av_opt_get_q,libavutil),Cint,(Ptr{Cvoid},Ptr{UInt8},Cint,Ptr{AVRational}),obj,name,search_flags,out_val) end diff --git a/src/libav/AVUtil/v53/pixdesc.jl b/src/libav/AVUtil/v53/pixdesc.jl index e8909c7d..7dab09cc 100644 --- a/src/libav/AVUtil/v53/pixdesc.jl +++ b/src/libav/AVUtil/v53/pixdesc.jl @@ -18,11 +18,11 @@ export function av_read_image_line(dst,data,linesize,desc,x::Integer,y::Integer,c::Integer,w::Integer,read_pal_component::Integer) - ccall((:av_read_image_line,libavutil),Void,(Ptr{UInt16},Ptr{Ptr{UInt8}},Ptr{Cint},Ptr{AVPixFmtDescriptor},Cint,Cint,Cint,Cint,Cint),dst,data,linesize,desc,x,y,c,w,read_pal_component) + ccall((:av_read_image_line,libavutil),Cvoid,(Ptr{UInt16},Ptr{Ptr{UInt8}},Ptr{Cint},Ptr{AVPixFmtDescriptor},Cint,Cint,Cint,Cint,Cint),dst,data,linesize,desc,x,y,c,w,read_pal_component) end function av_write_image_line(src,data,linesize,desc,x::Integer,y::Integer,c::Integer,w::Integer) - ccall((:av_write_image_line,libavutil),Void,(Ptr{UInt16},Ptr{Ptr{UInt8}},Ptr{Cint},Ptr{AVPixFmtDescriptor},Cint,Cint,Cint,Cint),src,data,linesize,desc,x,y,c,w) + ccall((:av_write_image_line,libavutil),Cvoid,(Ptr{UInt16},Ptr{Ptr{UInt8}},Ptr{Cint},Ptr{AVPixFmtDescriptor},Cint,Cint,Cint,Cint),src,data,linesize,desc,x,y,c,w) end function av_get_pix_fmt(name) diff --git a/src/libav/AVUtil/v53/xtea.jl b/src/libav/AVUtil/v53/xtea.jl index 401c20a8..5df85327 100644 --- a/src/libav/AVUtil/v53/xtea.jl +++ b/src/libav/AVUtil/v53/xtea.jl @@ -8,9 +8,9 @@ export function av_xtea_init(ctx,key) - ccall((:av_xtea_init,libavutil),Void,(Ptr{AVXTEA},Ptr{UInt8}),ctx,key) + ccall((:av_xtea_init,libavutil),Cvoid,(Ptr{AVXTEA},Ptr{UInt8}),ctx,key) end function av_xtea_crypt(ctx,dst,src,count::Integer,iv,decrypt::Integer) - ccall((:av_xtea_crypt,libavutil),Void,(Ptr{AVXTEA},Ptr{UInt8},Ptr{UInt8},Cint,Ptr{UInt8},Cint),ctx,dst,src,count,iv,decrypt) + ccall((:av_xtea_crypt,libavutil),Cvoid,(Ptr{AVXTEA},Ptr{UInt8},Ptr{UInt8},Cint,Ptr{UInt8},Cint),ctx,dst,src,count,iv,decrypt) end diff --git a/src/libav/SWScale/v2/libswscale_h.jl b/src/libav/SWScale/v2/libswscale_h.jl index 4d5667a4..928844a0 100644 --- a/src/libav/SWScale/v2/libswscale_h.jl +++ b/src/libav/SWScale/v2/libswscale_h.jl @@ -88,4 +88,4 @@ struct SwsFilter chrV::Ptr{SwsVector} end -const SwsContext=Void +const SwsContext=Nothing diff --git a/src/libav/SWScale/v2/swscale.jl b/src/libav/SWScale/v2/swscale.jl index e248968d..070171c9 100644 --- a/src/libav/SWScale/v2/swscale.jl +++ b/src/libav/SWScale/v2/swscale.jl @@ -75,7 +75,7 @@ function sws_init_context(sws_context,srcFilter,dstFilter) end function sws_freeContext(swsContext) - ccall((:sws_freeContext,libswscale),Void,(Ptr{SwsContext},),swsContext) + ccall((:sws_freeContext,libswscale),Cvoid,(Ptr{SwsContext},),swsContext) end function sws_getContext(srcW::Integer,srcH::Integer,srcFormat::AVPixelFormat,dstW::Integer,dstH::Integer,dstFormat::AVPixelFormat,flags::Integer,srcFilter,dstFilter,param) @@ -111,27 +111,27 @@ function sws_getIdentityVec() end function sws_scaleVec(a,scalar::Cdouble) - ccall((:sws_scaleVec,libswscale),Void,(Ptr{SwsVector},Cdouble),a,scalar) + ccall((:sws_scaleVec,libswscale),Cvoid,(Ptr{SwsVector},Cdouble),a,scalar) end function sws_normalizeVec(a,height::Cdouble) - ccall((:sws_normalizeVec,libswscale),Void,(Ptr{SwsVector},Cdouble),a,height) + ccall((:sws_normalizeVec,libswscale),Cvoid,(Ptr{SwsVector},Cdouble),a,height) end function sws_convVec(a,b) - ccall((:sws_convVec,libswscale),Void,(Ptr{SwsVector},Ptr{SwsVector}),a,b) + ccall((:sws_convVec,libswscale),Cvoid,(Ptr{SwsVector},Ptr{SwsVector}),a,b) end function sws_addVec(a,b) - ccall((:sws_addVec,libswscale),Void,(Ptr{SwsVector},Ptr{SwsVector}),a,b) + ccall((:sws_addVec,libswscale),Cvoid,(Ptr{SwsVector},Ptr{SwsVector}),a,b) end function sws_subVec(a,b) - ccall((:sws_subVec,libswscale),Void,(Ptr{SwsVector},Ptr{SwsVector}),a,b) + ccall((:sws_subVec,libswscale),Cvoid,(Ptr{SwsVector},Ptr{SwsVector}),a,b) end function sws_shiftVec(a,shift::Integer) - ccall((:sws_shiftVec,libswscale),Void,(Ptr{SwsVector},Cint),a,shift) + ccall((:sws_shiftVec,libswscale),Cvoid,(Ptr{SwsVector},Cint),a,shift) end function sws_cloneVec(a) @@ -139,11 +139,11 @@ function sws_cloneVec(a) end function sws_printVec2(a,log_ctx,log_level::Integer) - ccall((:sws_printVec2,libswscale),Void,(Ptr{SwsVector},Ptr{AVClass},Cint),a,log_ctx,log_level) + ccall((:sws_printVec2,libswscale),Cvoid,(Ptr{SwsVector},Ptr{AVClass},Cint),a,log_ctx,log_level) end function sws_freeVec(a) - ccall((:sws_freeVec,libswscale),Void,(Ptr{SwsVector},),a) + ccall((:sws_freeVec,libswscale),Cvoid,(Ptr{SwsVector},),a) end function sws_getDefaultFilter(lumaGBlur::Cfloat,chromaGBlur::Cfloat,lumaSharpen::Cfloat,chromaSharpen::Cfloat,chromaHShift::Cfloat,chromaVShift::Cfloat,verbose::Integer) @@ -151,7 +151,7 @@ function sws_getDefaultFilter(lumaGBlur::Cfloat,chromaGBlur::Cfloat,lumaSharpen: end function sws_freeFilter(filter) - ccall((:sws_freeFilter,libswscale),Void,(Ptr{SwsFilter},),filter) + ccall((:sws_freeFilter,libswscale),Cvoid,(Ptr{SwsFilter},),filter) end function sws_getCachedContext(context,srcW::Integer,srcH::Integer,srcFormat::AVPixelFormat,dstW::Integer,dstH::Integer,dstFormat::AVPixelFormat,flags::Integer,srcFilter,dstFilter,param) @@ -159,11 +159,11 @@ function sws_getCachedContext(context,srcW::Integer,srcH::Integer,srcFormat::AVP end function sws_convertPalette8ToPacked32(src,dst,num_pixels::Integer,palette) - ccall((:sws_convertPalette8ToPacked32,libswscale),Void,(Ptr{UInt8},Ptr{UInt8},Cint,Ptr{UInt8}),src,dst,num_pixels,palette) + ccall((:sws_convertPalette8ToPacked32,libswscale),Cvoid,(Ptr{UInt8},Ptr{UInt8},Cint,Ptr{UInt8}),src,dst,num_pixels,palette) end function sws_convertPalette8ToPacked24(src,dst,num_pixels::Integer,palette) - ccall((:sws_convertPalette8ToPacked24,libswscale),Void,(Ptr{UInt8},Ptr{UInt8},Cint,Ptr{UInt8}),src,dst,num_pixels,palette) + ccall((:sws_convertPalette8ToPacked24,libswscale),Cvoid,(Ptr{UInt8},Ptr{UInt8},Cint,Ptr{UInt8}),src,dst,num_pixels,palette) end function sws_get_class() diff --git a/src/testvideos.jl b/src/testvideos.jl index 764ade77..0fad8781 100644 --- a/src/testvideos.jl +++ b/src/testvideos.jl @@ -95,7 +95,7 @@ end function download(v::VideoFile) write_info(v) - println(STDERR, "Downloading $(v.name) to $videodir") + println(stderr, "Downloading $(v.name) to $videodir") download(v.download_url, joinpath(videodir, v.name)) end diff --git a/src/util.jl b/src/util.jl index 655e5ec8..690ba6ff 100644 --- a/src/util.jl +++ b/src/util.jl @@ -28,7 +28,7 @@ function open_stdout_stderr(cmd::Cmd) Base.link_pipe(out, true, cmd_out, false) Base.link_pipe(err, true, cmd_err, false) - r = spawn(ignorestatus(cmd), (DevNull, cmd_out, cmd_err)) + r = spawn(ignorestatus(cmd), (devnull, cmd_out, cmd_err)) Base.close_pipe_sync(cmd_out) Base.close_pipe_sync(cmd_err) @@ -43,5 +43,5 @@ end function readall_stdout_stderr(cmd::Cmd) (out, err, proc) = open_stdout_stderr(cmd) - return (readstring(out), readstring(err)) + return (read(out, String), read(err, String)) end diff --git a/test/avio.jl b/test/avio.jl index 0ccddc28..32603ba7 100644 --- a/test/avio.jl +++ b/test/avio.jl @@ -1,4 +1,4 @@ -using Base.Test +using Test using ColorTypes, FileIO, ImageCore import VideoIO @@ -11,15 +11,15 @@ VideoIO.TestVideos.download_all() swapext(f, new_ext) = "$(splitext(f)[1])$new_ext" -println(STDERR, "Testing file reading...") +println(stderr, "Testing file reading...") @noinline function notblank(img) all(c->green(c) == 0, img) || all(c->blue(c) == 0, img) || all(c->red(c) == 0, img) || maximum(rawview(channelview(img))) < 0xcf end for name in VideoIO.TestVideos.names() - is_apple() && startswith(name, "crescent") && continue - println(STDERR, " Testing $name...") + Sys.isapple() && startswith(name, "crescent") && continue + println(stderr, " Testing $name...") first_frame_file = joinpath(testdir, swapext(name, ".png")) fiftieth_frame_file = joinpath(testdir, swapext(name, "")*"50.png") @@ -83,13 +83,13 @@ for name in VideoIO.TestVideos.names() close(v) end -println(STDERR, "Testing IO reading...") +println(stderr, "Testing IO reading...") for name in VideoIO.TestVideos.names() - is_apple() && startswith(name, "crescent") && continue + Sys.isapple() && startswith(name, "crescent") && continue # TODO: fix me? (startswith(name, "ladybird") || startswith(name, "NPS")) && continue - println(STDERR, " Testing $name...") + println(stderr, " Testing $name...") first_frame_file = joinpath(testdir, swapext(name, ".png")) first_frame = load(first_frame_file) # comment line when creating png files diff --git a/util/archive/wrap_avbin.jl b/util/archive/wrap_avbin.jl index 26ba96b4..1432ef75 100644 --- a/util/archive/wrap_avbin.jl +++ b/util/archive/wrap_avbin.jl @@ -4,8 +4,8 @@ import DataStructures: DefaultDict import Base.Meta.isexpr using Match -indexh = joinpath(JULIA_HOME, "../include/clang-c/Index.h") -clang_includes = [joinpath(JULIA_HOME, "../lib/clang/3.3/include"), joinpath(dirname(indexh), "..")] +indexh = joinpath(Sys.BINDIR, "../include/clang-c/Index.h") +clang_includes = [joinpath(Sys.BINDIR, "../lib/clang/3.3/include"), joinpath(dirname(indexh), "..")] av_headers = ["/usr/include/avbin.h"] for header in av_headers diff --git a/util/wrap_libav_split.jl b/util/wrap_libav_split.jl index 9afb89d4..938ca2b1 100644 --- a/util/wrap_libav_split.jl +++ b/util/wrap_libav_split.jl @@ -6,8 +6,8 @@ using Match include("../src/init.jl") -indexh = joinpath(JULIA_HOME, "../include/clang-c/Index.h") -clang_includes = String[joinpath(JULIA_HOME, "../lib/clang/3.7.1/include"), joinpath(dirname(indexh), "..")] +indexh = joinpath(Sys.BINDIR, "../include/clang-c/Index.h") +clang_includes = String[joinpath(Sys.BINDIR, "../lib/clang/3.7.1/include"), joinpath(dirname(indexh), "..")] #clang_includes = String[joinpath(JULIA_HOME, "../lib/clang/3.3/include"), joinpath(dirname(indexh), "..")] strpack_structs = Set{Symbol}() From ec231454bef61ef4f99e86ffe46cad4665fa7d32 Mon Sep 17 00:00:00 2001 From: Robin Deits Date: Wed, 22 Aug 2018 00:10:37 -0400 Subject: [PATCH 03/12] don't modify LOAD_PATH and fix some deprecations on 0.7 --- src/VideoIO.jl | 13 +++++++++---- src/avio.jl | 16 ++++++++-------- src/ffmpeg/AVCodecs/src/AVCodecs.jl | 4 ++-- src/ffmpeg/AVDevice/src/AVDevice.jl | 6 +++--- src/ffmpeg/AVFilters/src/AVFilters.jl | 4 ++-- src/ffmpeg/AVFormat/src/AVFormat.jl | 4 ++-- src/ffmpeg/SWResample/src/SWResample.jl | 4 ++-- src/ffmpeg/SWScale/src/SWScale.jl | 2 +- src/init.jl | 8 ++------ src/libav/AVCodecs/src/AVCodecs.jl | 4 ++-- src/libav/AVDevice/src/AVDevice.jl | 6 +++--- src/libav/AVFormat/src/AVFormat.jl | 4 ++-- src/libav/SWScale/src/SWScale.jl | 2 +- src/version.jl | 4 ++-- 14 files changed, 41 insertions(+), 40 deletions(-) diff --git a/src/VideoIO.jl b/src/VideoIO.jl index 500dd9e9..933ecafc 100644 --- a/src/VideoIO.jl +++ b/src/VideoIO.jl @@ -5,11 +5,16 @@ module VideoIO using FixedPointNumbers, ColorTypes, ImageCore include("init.jl") +include(joinpath(av_load_path, "AVUtil", "src", "AVUtil.jl")) +include(joinpath(av_load_path, "AVCodecs", "src", "AVCodecs.jl")) +include(joinpath(av_load_path, "AVFormat", "src", "AVFormat.jl")) +include(joinpath(av_load_path, "AVDevice", "src", "AVDevice.jl")) +include(joinpath(av_load_path, "SWScale", "src", "SWScale.jl")) -using AVUtil -using AVCodecs -using AVFormat -using SWScale +using .AVUtil +using .AVCodecs +using .AVFormat +using .SWScale include("util.jl") include("avio.jl") diff --git a/src/avio.jl b/src/avio.jl index f2e6a559..d1fef86b 100644 --- a/src/avio.jl +++ b/src/avio.jl @@ -130,7 +130,7 @@ function _read_packet(pavin::Ptr{AVInput}, pbuf::Ptr{UInt8}, buf_size::Cint) convert(Cint, readbytes!(avin.io, out)) end -const read_packet = cfunction(_read_packet, Cint, (Ptr{AVInput}, Ptr{UInt8}, Cint)) +const read_packet = @cfunction(_read_packet, Cint, (Ptr{AVInput}, Ptr{UInt8}, Cint)) function open_avinput(avin::AVInput, io::IO, input_format=C_NULL) @@ -195,7 +195,7 @@ function AVInput(source::T, input_format=C_NULL; avio_ctx_buffer_size=65536) whe aPacket, [StreamInfo[] for i=1:6]..., Set(Int[]), StreamContext[], false) # Make sure we deallocate everything on exit - finalizer(avin, close) + finalizer(close, avin) # Set up the format context and open the input, based on the type of source open_avinput(avin, source, input_format) @@ -283,7 +283,7 @@ function VideoReader(avin::AVInput, video_stream=1; end N = Int64(bits_per_pixel >> 3) - target_buf = Array{UInt8}(bits_per_pixel>>3, width, height) + target_buf = Array{UInt8}(undef, bits_per_pixel>>3, width, height) sws_context = sws_getContext(width, height, pix_fmt, width, height, target_format, @@ -624,11 +624,11 @@ end ### Camera Functions if have_avdevice() - import AVDevice + import .AVDevice AVDevice.avdevice_register_all() function get_camera_devices(ffmpeg, idev, idev_name) - CAMERA_DEVICES = String[] + camera_devices = String[] read_vid_devs = false out,err = readall_stdout_stderr(`$ffmpeg -list_devices true -f $idev -i $idev_name`) @@ -645,18 +645,18 @@ if have_avdevice() if read_vid_devs m = match(r"""\[.*"(.*)".?""", line) if m != nothing - push!(CAMERA_DEVICES, m.captures[1]) + push!(camera_devices, m.captures[1]) end # Alternative format (TODO: could be combined with the regex above) m = match(r"""\[.*\] \[[0-9]\] (.*)""", line) if m != nothing - push!(CAMERA_DEVICES, m.captures[1]) + push!(camera_devices, m.captures[1]) end end end - return CAMERA_DEVICES + return camera_devices end if Sys.iswindows() diff --git a/src/ffmpeg/AVCodecs/src/AVCodecs.jl b/src/ffmpeg/AVCodecs/src/AVCodecs.jl index 94df8b2d..8b6c6019 100644 --- a/src/ffmpeg/AVCodecs/src/AVCodecs.jl +++ b/src/ffmpeg/AVCodecs/src/AVCodecs.jl @@ -2,11 +2,11 @@ module AVCodecs include(joinpath(dirname(@__FILE__),"..","..","..","init.jl")) w(f) = joinpath(avcodec_dir, f) - using AVUtil + using ..AVUtil include(w("LIBAVCODEC.jl")) AVPacket() = AVPacket([T<:Ptr ? C_NULL : zero(T) for T in AVPacket.types]...) - + end diff --git a/src/ffmpeg/AVDevice/src/AVDevice.jl b/src/ffmpeg/AVDevice/src/AVDevice.jl index 30c9bb81..b0f18278 100644 --- a/src/ffmpeg/AVDevice/src/AVDevice.jl +++ b/src/ffmpeg/AVDevice/src/AVDevice.jl @@ -2,8 +2,8 @@ module AVDevice include(joinpath(dirname(@__FILE__),"..","..","..","init.jl")) w(f) = joinpath(avdevice_dir, f) - using AVUtil - using AVFormat - using AVCodecs + using ..AVUtil + using ..AVFormat + using ..AVCodecs include(w("LIBAVDEVICE.jl")) end diff --git a/src/ffmpeg/AVFilters/src/AVFilters.jl b/src/ffmpeg/AVFilters/src/AVFilters.jl index f680810e..bbf86481 100644 --- a/src/ffmpeg/AVFilters/src/AVFilters.jl +++ b/src/ffmpeg/AVFilters/src/AVFilters.jl @@ -2,6 +2,6 @@ module AVFilters include(joinpath(dirname(@__FILE__),"..","..","..","init.jl")) w(f) = joinpath(avfilter_dir, f) - using AVUtil - include(w("LIBAVFILTER.jl")) + using ..AVUtil + include(w("LIBAVFILTER.jl")) end diff --git a/src/ffmpeg/AVFormat/src/AVFormat.jl b/src/ffmpeg/AVFormat/src/AVFormat.jl index 571feec0..6e078fde 100644 --- a/src/ffmpeg/AVFormat/src/AVFormat.jl +++ b/src/ffmpeg/AVFormat/src/AVFormat.jl @@ -2,8 +2,8 @@ module AVFormat include(joinpath(dirname(@__FILE__),"..","..","..","init.jl")) w(f) = joinpath(avformat_dir, f) - using AVUtil - using AVCodecs + using ..AVUtil + using ..AVCodecs include(w("LIBAVFORMAT.jl")) end diff --git a/src/ffmpeg/SWResample/src/SWResample.jl b/src/ffmpeg/SWResample/src/SWResample.jl index b8d59750..c88a9cd6 100644 --- a/src/ffmpeg/SWResample/src/SWResample.jl +++ b/src/ffmpeg/SWResample/src/SWResample.jl @@ -2,6 +2,6 @@ module SWResample include(joinpath(dirname(@__FILE__),"..","..","..","init.jl")) w(f) = joinpath(swresample_dir, f) - using AVUtil - include(w("LIBSWRESAMPLE.jl")) + using ..AVUtil + include(w("LIBSWRESAMPLE.jl")) end diff --git a/src/ffmpeg/SWScale/src/SWScale.jl b/src/ffmpeg/SWScale/src/SWScale.jl index f1a6bbe7..c7c36ec7 100644 --- a/src/ffmpeg/SWScale/src/SWScale.jl +++ b/src/ffmpeg/SWScale/src/SWScale.jl @@ -2,6 +2,6 @@ module SWScale include(joinpath(dirname(@__FILE__),"..","..","..","init.jl")) w(f) = joinpath(swscale_dir, f) - using AVUtil + using ..AVUtil include(w("LIBSWSCALE.jl")) end diff --git a/src/init.jl b/src/init.jl index 3fad8e7f..d6f6ef67 100644 --- a/src/init.jl +++ b/src/init.jl @@ -5,18 +5,14 @@ using BinDeps # avcodec_version, avformat_version, avutil_version, swscale_version, avdevice_version, avfilter_version, avresample_version, swresample_version, # libavcodec, libavformat, libavutil, libswscale, libavdevice, libavfilter, libavresample, libswresample, -if !isdefined(:libavcodec) +if !@isdefined(libavcodec) include("../deps/deps.jl") end INSTALL_ROOT = realpath(joinpath(splitdir(libavcodec)[1], "..")) -if !isdefined(:ffmpeg_or_libav) +if !@isdefined(ffmpeg_or_libav) include("version.jl") end av_load_path = joinpath(dirname(@__FILE__), ffmpeg_or_libav) -!(av_load_path in LOAD_PATH) && pushfirst!(LOAD_PATH, av_load_path) - - - diff --git a/src/libav/AVCodecs/src/AVCodecs.jl b/src/libav/AVCodecs/src/AVCodecs.jl index 94df8b2d..8b6c6019 100644 --- a/src/libav/AVCodecs/src/AVCodecs.jl +++ b/src/libav/AVCodecs/src/AVCodecs.jl @@ -2,11 +2,11 @@ module AVCodecs include(joinpath(dirname(@__FILE__),"..","..","..","init.jl")) w(f) = joinpath(avcodec_dir, f) - using AVUtil + using ..AVUtil include(w("LIBAVCODEC.jl")) AVPacket() = AVPacket([T<:Ptr ? C_NULL : zero(T) for T in AVPacket.types]...) - + end diff --git a/src/libav/AVDevice/src/AVDevice.jl b/src/libav/AVDevice/src/AVDevice.jl index 30c9bb81..b0f18278 100644 --- a/src/libav/AVDevice/src/AVDevice.jl +++ b/src/libav/AVDevice/src/AVDevice.jl @@ -2,8 +2,8 @@ module AVDevice include(joinpath(dirname(@__FILE__),"..","..","..","init.jl")) w(f) = joinpath(avdevice_dir, f) - using AVUtil - using AVFormat - using AVCodecs + using ..AVUtil + using ..AVFormat + using ..AVCodecs include(w("LIBAVDEVICE.jl")) end diff --git a/src/libav/AVFormat/src/AVFormat.jl b/src/libav/AVFormat/src/AVFormat.jl index 571feec0..6e078fde 100644 --- a/src/libav/AVFormat/src/AVFormat.jl +++ b/src/libav/AVFormat/src/AVFormat.jl @@ -2,8 +2,8 @@ module AVFormat include(joinpath(dirname(@__FILE__),"..","..","..","init.jl")) w(f) = joinpath(avformat_dir, f) - using AVUtil - using AVCodecs + using ..AVUtil + using ..AVCodecs include(w("LIBAVFORMAT.jl")) end diff --git a/src/libav/SWScale/src/SWScale.jl b/src/libav/SWScale/src/SWScale.jl index 832c87c4..7f576980 100644 --- a/src/libav/SWScale/src/SWScale.jl +++ b/src/libav/SWScale/src/SWScale.jl @@ -2,7 +2,7 @@ module SWScale include(joinpath(dirname(@__FILE__),"..","..","..","init.jl")) w(f) = joinpath(swscale_dir, f) - using AVUtil + using ..AVUtil include(w("LIBSWSCALE.jl")) end diff --git a/src/version.jl b/src/version.jl index d1631299..23ba4a75 100644 --- a/src/version.jl +++ b/src/version.jl @@ -6,8 +6,8 @@ have_avutil() = Libdl.dlopen_e(libavutil) != C_NULL have_swscale() = Libdl.dlopen_e(libswscale) != C_NULL have_avdevice() = Libdl.dlopen_e(libavdevice) != C_NULL have_avfilter() = Libdl.dlopen_e(libavfilter) != C_NULL -#have_avresample() = isdefined(:libavresample) && Libdl.dlopen_e(libavresample) != C_NULL -#have_swresample() = isdefined(:libswresample) && Libdl.dlopen_e(libswresample) != C_NULL +#have_avresample() = @isdefined(libavresample) && Libdl.dlopen_e(libavresample) != C_NULL +#have_swresample() = @isdefined(libswresample) && Libdl.dlopen_e(libswresample) != C_NULL _avcodec_version() = have_avcodec() ? av_version(ccall((:avcodec_version, libavcodec), UInt32, ())) : v"0" _avformat_version() = have_avformat() ? av_version(ccall((:avformat_version, libavformat), UInt32, ())) : v"0" From 10ca772b610c7255cae5d7873e2e08fad03b1766 Mon Sep 17 00:00:00 2001 From: Robin Deits Date: Wed, 22 Aug 2018 00:29:58 -0400 Subject: [PATCH 04/12] use Requires so that load order doesn't matter --- README.md | 32 ++++++++++++++------------------ REQUIRE | 1 + src/VideoIO.jl | 35 ++++++++++++++++++++++++++++++++++- src/avio.jl | 48 +++--------------------------------------------- 4 files changed, 52 insertions(+), 64 deletions(-) diff --git a/README.md b/README.md index 27ae3f6b..dc00056b 100644 --- a/README.md +++ b/README.md @@ -3,9 +3,9 @@ VideoIO.jl ========== -Julia bindings for libav/ffmpeg. +Julia bindings for libav/ffmpeg. -Currently, only video reading is supported, for the following +Currently, only video reading is supported, for the following library versions: * libav 0.8, 9, 10 @@ -14,9 +14,9 @@ library versions: Video images may be read as raw arrays, or optionally, `Image` objects (if `Images.jl` is installed and loaded first). -Feel free to request support for additional libav/ffmpeg +Feel free to request support for additional libav/ffmpeg versions, although earlier versions may be too challenging to -support. +support. If you encounter any problems, please add the output of `VideoIO.versioninfo()` to your report. @@ -41,13 +41,10 @@ A trivial video player interface exists (no audio): # Aternatively, you can just open the camera #VideoIO.viewcam() -Note that `ImageView` must be imported before `VideoIO` for the `playvideo` -function to be available. - High Level Interface -------------------- -VideoIO contains a simple high-level interface which allows reading of +VideoIO contains a simple high-level interface which allows reading of video frames from a supported video file, or from a camera device: using Images @@ -71,19 +68,18 @@ video frames from a supported video file, or from a camera device: seek(f,2.5) ## The second parameter is the time in seconds and must be Float64 img = read(f) canvas, _ = ImageView.view(img) - + while !eof(f) read!(f, img) ImageView.imshow(canvas, img) #sleep(1/30) end -This code is essentially the code in `playvideo`, and will read and +This code is essentially the code in `playvideo`, and will read and (without the `sleep`) play a movie file as fast as possible. As with the `playvideo` function, the `Images` and `ImageView` packages -must be loaded before `VideoIO` for the appropriate functions to be -available. +must be loaded for the appropriate functions to be available. Low Level Interface @@ -112,17 +108,17 @@ After importing VideoIO, you can import and use any of the subpackages directly Note that much of the functionality of these subpackages is not enabled by default, to avoid long compilation times as they load. To control what is loaded, each library version has a file which imports that's -modules files. For example, ffmpeg's libswscale-v2 files are loaded by +modules files. For example, ffmpeg's libswscale-v2 files are loaded by $(VideoIO_PKG_DIR)/src/ffmpeg/SWScale/v2/LIBSWSCALE.jl. Check these files to enable any needed functionality that isn't already -enabled. Note that you'll probably need to do this for each version +enabled. Note that you'll probably need to do this for each version of the package for both ffmpeg and libav, and that the interfaces do change some from version to version. Note that, in general, the low-level functions are not very fun to use, -so it is good to focus initially on enabling a nice, higher-level -function for these interfaces. +so it is good to focus initially on enabling a nice, higher-level +function for these interfaces. Test Videos ----------- @@ -132,7 +128,7 @@ These are short videos in a variety of formats with non-restrictive (public domain or Creative Commons) licenses. * `VideoIO.TestVideos.available()` prints a list of all available test videos. -* `VideoIO.testvideo("annie_oakley")` returns an AVInput object for the +* `VideoIO.testvideo("annie_oakley")` returns an AVInput object for the `"annie_oakley"` video. The video will be downloaded if it isn't available. * `VideoIO.TestVideos.download_all()` downloads all test videos * `VideoIO.TestVideos.remove_all()` removes all test videos @@ -144,5 +140,5 @@ At this point, a simple video interface is available, for multiple versions of libav and ffmpeg. See TODO.md for some possible directions forward. -Issues, requests, and/or pull requests for problems or additional +Issues, requests, and/or pull requests for problems or additional functionality are very welcome. diff --git a/REQUIRE b/REQUIRE index 09fd24cb..b7bd6d7b 100644 --- a/REQUIRE +++ b/REQUIRE @@ -7,3 +7,4 @@ ImageCore ImageView 0.3.0 @osx Homebrew @linux Glob +Requires diff --git a/src/VideoIO.jl b/src/VideoIO.jl index 933ecafc..47accded 100644 --- a/src/VideoIO.jl +++ b/src/VideoIO.jl @@ -2,7 +2,7 @@ __precompile__(false) module VideoIO -using FixedPointNumbers, ColorTypes, ImageCore +using FixedPointNumbers, ColorTypes, ImageCore, Requires include("init.jl") include(joinpath(av_load_path, "AVUtil", "src", "AVUtil.jl")) @@ -21,4 +21,37 @@ include("avio.jl") include("testvideos.jl") using .TestVideos +function __init__() + @require ImageView="86fae568-95e7-573e-a6b2-d8a6b900c9ef" begin + # Define read and retrieve for Images + function play(f, flip=false) + buf = read(f) + canvas, _ = ImageView.imshow(buf, flipx=flip, interactive=false) + + while !eof(f) + read!(f, buf) + ImageView.imshow(canvas, buf, flipx=flip, interactive=false) + sleep(1/f.framerate) + end + end + + function playvideo(video) + f = VideoIO.openvideo(video) + play(f) + end + + if have_avdevice() + function viewcam(device=DEFAULT_CAMERA_DEVICE, format=DEFAULT_CAMERA_FORMAT) + camera = opencamera(device, format) + play(camera, true) + end + else + function viewcam() + error("libavdevice not present") + end + end + end +end + + end # VideoIO diff --git a/src/avio.jl b/src/avio.jl index d1fef86b..f4bf86b4 100644 --- a/src/avio.jl +++ b/src/avio.jl @@ -13,7 +13,7 @@ end abstract type StreamContext end -const EightBitTypes = Union{UInt8, N0f8, Main.ColorTypes.RGB{N0f8}} +const EightBitTypes = Union{UInt8, N0f8, ColorTypes.RGB{N0f8}} const PermutedArray{T,N,perm,iperm,AA<:Array} = Base.PermutedDimsArrays.PermutedDimsArray{T,N,perm,iperm,AA} const VidArray{T,N} = Union{Array{T,N},PermutedArray{T,N}} @@ -681,10 +681,10 @@ if have_avdevice() DEFAULT_CAMERA_FORMAT = AVFormat.av_find_input_format("avfoundation") global CAMERA_DEVICES = String[] try - CAMERA_DEVICES = get_camera_devices(ffmpeg, "avfoundation", "\"\"") + global CAMERA_DEVICES = get_camera_devices(ffmpeg, "avfoundation", "\"\"") catch try - CAMERA_DEVICES = get_camera_devices(ffmpeg, "qtkit", "\"\"") + global CAMERA_DEVICES = get_camera_devices(ffmpeg, "qtkit", "\"\"") catch end end @@ -698,45 +698,3 @@ if have_avdevice() VideoReader(camera, args...; kwargs...) end end - -try - if isa(Main.ImageView, Module) - # Define read and retrieve for Images - global playvideo, viewcam, play - - function play(f, flip=false) - buf = read(f) - canvas, _ = Main.ImageView.imshow(buf, flipx=flip, interactive=false) - - while !eof(f) - read!(f, buf) - Main.ImageView.imshow(canvas, buf, flipx=flip, interactive=false) - sleep(1/f.framerate) - end - end - - function playvideo(video) - f = VideoIO.openvideo(video) - play(f) - end - - if have_avdevice() - function viewcam(device=DEFAULT_CAMERA_DEVICE, format=DEFAULT_CAMERA_FORMAT) - camera = opencamera(device, format) - play(camera, true) - end - else - function viewcam() - error("libavdevice not present") - end - end - end -catch - global playvideo, viewcam, play - no_imageview() = error("Please load ImageView before VideoIO to enable play(...), playvideo(...) and viewcam()") - play() = no_imageview() - playvideo() = no_imageview() - viewcam() = no_imageview() -end - - From ba3a450271fa467150472a4c5784237d207dfe53 Mon Sep 17 00:00:00 2001 From: Kevin Squire Date: Wed, 22 Aug 2018 10:43:39 -0700 Subject: [PATCH 05/12] Add zlib1g-dev to travis * This is an attempt to resolve the current zlib issues --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 29441b90..6a8417e2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,6 +15,7 @@ addons: - libavutil-extra-52 - libswscale2 - libgtk-3-dev + - zlib1g-dev os: - linux # - osx From 28e790ff8cf97ec546cd24aec088f6551a1d8708 Mon Sep 17 00:00:00 2001 From: Kevin Squire Date: Thu, 23 Aug 2018 18:27:14 -0700 Subject: [PATCH 06/12] Import ImageMagick before running tests * ImageMagick is imported on demand by FileIO * If VideoIO is imported first, it loads ffmpeg/libav libraries. These libraries may be linked against the system libz. If they are, and ImageMagick is loaded later, it attemtps to use the already loaded version of libz, and may fail to load because it requires a later version. --- test/avio.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/avio.jl b/test/avio.jl index 32603ba7..a6043517 100644 --- a/test/avio.jl +++ b/test/avio.jl @@ -1,5 +1,5 @@ using Test -using ColorTypes, FileIO, ImageCore +using ColorTypes, FileIO, ImageCore, ImageMagick import VideoIO From 61b91159b4826c6b6e1045d4199a3d9083d6bf57 Mon Sep 17 00:00:00 2001 From: Kevin Squire Date: Mon, 27 Aug 2018 15:01:56 -0700 Subject: [PATCH 07/12] Update test images * For some reason, the value scaling of the images used to compare the first (non-blank) video frame has changed --- test/annie_oakley.png | Bin 31367 -> 31390 bytes test/black_hole.png | Bin 46395 -> 46418 bytes test/crescent-moon.png | Bin 108077 -> 108100 bytes test/ladybird.png | Bin 301586 -> 301609 bytes 4 files changed, 0 insertions(+), 0 deletions(-) diff --git a/test/annie_oakley.png b/test/annie_oakley.png index c44e2091ec8b055e3e8616fd3ef0dda70297f129..a54136880f1b04375ac833b379ab0b4d779727b3 100644 GIT binary patch delta 67 zcmZqw$~f;U;{+{ZhK>E)e-c?47#I|iJ%W507^>757#dm_7=8hT8eT9klo~KFyh>nT Wu$sZZAYL$MSD?*ALy?V9x>W$R1ryHz delta 59 zcmbRDm9hOR;{+`|#4nJa0`JjUdpR{;Qn<`laC diff --git a/test/black_hole.png b/test/black_hole.png index 769a40d6083b0766f76cbe62e57aa40ef1fde328..d6e64534498b33aefd2b2ba2568f193e0b6fb59b 100644 GIT binary patch delta 67 zcmdn}is{lTrU_cc3>*8o|0J?9Ffb@2dj$D1FjT2AFf_C*8o|0J?9Ffb@2dj$D1FjT2AFf_C*8o|0J?9Ffb@2dj$D1FjT2AFf_C Date: Mon, 27 Aug 2018 15:03:11 -0700 Subject: [PATCH 08/12] Rename notblank() -> isblank() in test/avio.jl * The function is testing whether the last read video frame was blank, so it was misnamed! --- test/avio.jl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/avio.jl b/test/avio.jl index a6043517..ae57cd1e 100644 --- a/test/avio.jl +++ b/test/avio.jl @@ -13,7 +13,7 @@ swapext(f, new_ext) = "$(splitext(f)[1])$new_ext" println(stderr, "Testing file reading...") -@noinline function notblank(img) +@noinline function isblank(img) all(c->green(c) == 0, img) || all(c->blue(c) == 0, img) || all(c->red(c) == 0, img) || maximum(rawview(channelview(img))) < 0xcf end @@ -35,7 +35,7 @@ for name in VideoIO.TestVideos.names() img = read(v) # Find the first non-trivial image - while notblank(img) + while isblank(img) read!(v, img) end @@ -73,7 +73,7 @@ for name in VideoIO.TestVideos.names() read!(v, img) - while notblank(img) + while isblank(img) read!(v, img) end @@ -103,7 +103,7 @@ for name in VideoIO.TestVideos.names() img = read(v) # Find the first non-trivial image - while notblank(img) + while isblank(img) read!(v, img) end From 832108a09fbdee96f2b8d3f18bedf6c964a64674 Mon Sep 17 00:00:00 2001 From: Kevin Squire Date: Mon, 27 Aug 2018 15:17:46 -0700 Subject: [PATCH 09/12] (Auto)format files with findfirst changes initialization * This is a separate commit which just contains formatting changes for files in the next commit, to make reviewing easier --- src/VideoIO.jl | 4 +- src/avio.jl | 54 +++++++++++++-------------- src/ffmpeg/AVCodecs/v53/LIBAVCODEC.jl | 2 +- src/ffmpeg/AVUtil/v52/LIBAVUTIL.jl | 2 +- src/libav/AVCodecs/v53/LIBAVCODEC.jl | 2 +- src/libav/AVCodecs/v54/LIBAVCODEC.jl | 2 +- src/libav/AVUtil/v53/LIBAVUTIL.jl | 2 +- src/util.jl | 4 +- 8 files changed, 36 insertions(+), 36 deletions(-) diff --git a/src/VideoIO.jl b/src/VideoIO.jl index 47accded..0d7b861a 100644 --- a/src/VideoIO.jl +++ b/src/VideoIO.jl @@ -22,7 +22,7 @@ include("testvideos.jl") using .TestVideos function __init__() - @require ImageView="86fae568-95e7-573e-a6b2-d8a6b900c9ef" begin + @require ImageView = "86fae568-95e7-573e-a6b2-d8a6b900c9ef" begin # Define read and retrieve for Images function play(f, flip=false) buf = read(f) @@ -31,7 +31,7 @@ function __init__() while !eof(f) read!(f, buf) ImageView.imshow(canvas, buf, flipx=flip, interactive=false) - sleep(1/f.framerate) + sleep(1 / f.framerate) end end diff --git a/src/avio.jl b/src/avio.jl index f4bf86b4..395cdfc1 100644 --- a/src/avio.jl +++ b/src/avio.jl @@ -13,8 +13,8 @@ end abstract type StreamContext end -const EightBitTypes = Union{UInt8, N0f8, ColorTypes.RGB{N0f8}} -const PermutedArray{T,N,perm,iperm,AA<:Array} = Base.PermutedDimsArrays.PermutedDimsArray{T,N,perm,iperm,AA} +const EightBitTypes = Union{UInt8,N0f8,ColorTypes.RGB{N0f8}} +const PermutedArray{T,N,perm,iperm,AA <: Array} = Base.PermutedDimsArrays.PermutedDimsArray{T,N,perm,iperm,AA} const VidArray{T,N} = Union{Array{T,N},PermutedArray{T,N}} # TODO: move this to Base @@ -109,7 +109,7 @@ function pump(c::AVInput) # If we're not listening to this stream, skip it if stream_index in c.listening # Decode the packet, and check if the frame is complete - frameFinished = decode_packet(c.stream_contexts[stream_index+1], c.aPacket) + frameFinished = decode_packet(c.stream_contexts[stream_index + 1], c.aPacket) av_free_packet(pointer(c.aPacket)) # If the frame is complete, we're done @@ -180,7 +180,7 @@ function open_avinput(avin::AVInput, source::AbstractString, input_format=C_NULL nothing end -function AVInput(source::T, input_format=C_NULL; avio_ctx_buffer_size=65536) where T<:Union{IO, AbstractString} +function AVInput(source::T, input_format=C_NULL; avio_ctx_buffer_size=65536) where T <: Union{IO,AbstractString} # Register all codecs and formats av_register_all() @@ -192,7 +192,7 @@ function AVInput(source::T, input_format=C_NULL; avio_ctx_buffer_size=65536) whe # Allocate this object (needed to pass into AVIOContext in open_avinput) avin = AVInput{T}(source, apFormatContext, apAVIOContext, avio_ctx_buffer_size, - aPacket, [StreamInfo[] for i=1:6]..., Set(Int[]), StreamContext[], false) + aPacket, [StreamInfo[] for i = 1:6]..., Set(Int[]), StreamContext[], false) # Make sure we deallocate everything on exit finalizer(close, avin) @@ -210,12 +210,12 @@ function AVInput(source::T, input_format=C_NULL; avio_ctx_buffer_size=65536) whe formatContext = unsafe_load(avin.apFormatContext[1]); for i = 1:formatContext.nb_streams - pStream = unsafe_load(formatContext.streams,i) + pStream = unsafe_load(formatContext.streams, i) stream = unsafe_load(pStream) codec_ctx = unsafe_load(stream.codec) codec_type = codec_ctx.codec_type - stream_info = StreamInfo(i-1, pStream, stream, codec_ctx) + stream_info = StreamInfo(i - 1, pStream, stream, codec_ctx) if codec_type == AVMEDIA_TYPE_VIDEO push!(avin.video_info, stream_info) @@ -283,7 +283,7 @@ function VideoReader(avin::AVInput, video_stream=1; end N = Int64(bits_per_pixel >> 3) - target_buf = Array{UInt8}(undef, bits_per_pixel>>3, width, height) + target_buf = Array{UInt8}(undef, bits_per_pixel >> 3, width, height) sws_context = sws_getContext(width, height, pix_fmt, width, height, target_format, @@ -324,12 +324,12 @@ function VideoReader(avin::AVInput, video_stream=1; idx0 = stream_info.stream_index0 push!(avin.listening, idx0) - avin.stream_contexts[idx0+1] = vr + avin.stream_contexts[idx0 + 1] = vr vr end -VideoReader(s::T, args...; kwargs...) where {T<:Union{IO, AbstractString}} = VideoReader(AVInput(s), args...; kwargs... ) +VideoReader(s::T, args...; kwargs...) where {T <: Union{IO,AbstractString}} = VideoReader(AVInput(s), args...; kwargs... ) function decode_packet(r::VideoReader, aPacket) # Do we already have a complete frame that hasn't been consumed? @@ -388,7 +388,7 @@ function retrieve(r::VideoReader{NO_TRANSCODE}) # false=don't transcode end # Converts a grabbed frame to the correct format (RGB by default) -function retrieve!(r::VideoReader{TRANSCODE}, buf::VidArray{T}) where T<:EightBitTypes +function retrieve!(r::VideoReader{TRANSCODE}, buf::VidArray{T}) where T <: EightBitTypes while !have_frame(r) idx = pump(r.avin) idx == r.stream_index0 && break @@ -431,7 +431,7 @@ function retrieve!(r::VideoReader{TRANSCODE}, buf::VidArray{T}) where T<:EightBi return buf end -function retrieve!(r::VideoReader{NO_TRANSCODE}, buf::VidArray{T}) where T<:EightBitTypes +function retrieve!(r::VideoReader{NO_TRANSCODE}, buf::VidArray{T}) where T <: EightBitTypes while !have_frame(r) idx = pump(r.avin) idx == r.stream_index0 && break @@ -450,19 +450,19 @@ open(filename::AbstractString) = AVInput(filename) openvideo(args...; kwargs...) = VideoReader(args...; kwargs...) read(r::VideoReader) = retrieve(r) -read!(r::VideoReader, buf::AbstractArray{T}) where {T<:EightBitTypes} = retrieve!(r, buf) +read!(r::VideoReader, buf::AbstractArray{T}) where {T <: EightBitTypes} = retrieve!(r, buf) -isopen(avin::AVInput{I}) where {I<:IO} = isopen(avin.io) +isopen(avin::AVInput{I}) where {I <: IO} = isopen(avin.io) isopen(avin::AVInput) = avin.isopen isopen(r::VideoReader) = isopen(r.avin) -bufsize_check(r::VideoReader{NO_TRANSCODE}, buf::VidArray{T}) where {T<:EightBitTypes} = (length(buf)*sizeof(T) == avpicture_get_size(r.format, r.width, r.height)) -bufsize_check(r::VideoReader{TRANSCODE}, buf::VidArray{T}) where {T<:EightBitTypes} = bufsize_check(r.transcodeContext, buf) -bufsize_check(t::VideoTranscodeContext, buf::VidArray{T}) where {T<:EightBitTypes} = (length(buf)*sizeof(T) == avpicture_get_size(t.target_pix_fmt, t.width, t.height)) +bufsize_check(r::VideoReader{NO_TRANSCODE}, buf::VidArray{T}) where {T <: EightBitTypes} = (length(buf) * sizeof(T) == avpicture_get_size(r.format, r.width, r.height)) +bufsize_check(r::VideoReader{TRANSCODE}, buf::VidArray{T}) where {T <: EightBitTypes} = bufsize_check(r.transcodeContext, buf) +bufsize_check(t::VideoTranscodeContext, buf::VidArray{T}) where {T <: EightBitTypes} = (length(buf) * sizeof(T) == avpicture_get_size(t.target_pix_fmt, t.width, t.height)) have_decoded_frame(r) = r.aFrameFinished[1] > 0 # TODO: make sure the last frame was made available have_frame(r::StreamContext) = !isempty(r.frame_queue) || have_decoded_frame(r) -have_frame(avin::AVInput) = any(Bool[have_frame(avin.stream_contexts[i+1]) for i in avin.listening]) +have_frame(avin::AVInput) = any(Bool[have_frame(avin.stream_contexts[i + 1]) for i in avin.listening]) reset_frame_flag!(r) = (r.aFrameFinished[1] = 0) @@ -471,7 +471,7 @@ function seconds_to_timestamp(s::Float64, time_base::AVRational) end function seek(s::VideoReader, seconds::Float64, - seconds_min::Float64 = -1.0, seconds_max::Float64 = -1.0, + seconds_min::Float64=-1.0, seconds_max::Float64=-1.0, video_stream::Int64=1, forward::Bool=false) !isopen(s) && throw(ErrorException("Video input stream is not open!")) @@ -496,7 +496,7 @@ function seek(s::VideoReader, seconds::Float64, pStream = stream_info.pStream frame_rate = av_stream_get_r_frame_rate(pStream) - frameskip = round(Int64,(stream.time_base.den/stream.time_base.num)/(frame_rate.num/frame_rate.den)) + frameskip = round(Int64, (stream.time_base.den / stream.time_base.num) / (frame_rate.num / frame_rate.den)) while actualTimestamp < (dts - frameskip) while !have_frame(s) @@ -511,8 +511,8 @@ function seek(s::VideoReader, seconds::Float64, end function seek(avin::AVInput{T}, seconds::Float64, - seconds_min::Float64 = -1.0, seconds_max::Float64 = -1.0, - video_stream::Int64 = 1, forward::Bool=false) where T<:AbstractString + seconds_min::Float64=-1.0, seconds_max::Float64=-1.0, + video_stream::Int64=1, forward::Bool=false) where T <: AbstractString #Using 10 seconds before and after the desired timestamp, since the seek function #seek to the nearest keyframe, and 10 seconds is the longest GOP length seen in @@ -562,13 +562,13 @@ function seekstart(s::VideoReader, video_stream=1) return seek(s, 0.0, 0.0, 0.0, video_stream, false) end -function seekstart(avin::AVInput{T}, video_stream = 1) where T<:AbstractString +function seekstart(avin::AVInput{T}, video_stream=1) where T <: AbstractString return seek(avin, 0.0, 0.0, 0.0, video_stream, false) end ## This doesn't work... #seekstart{T<:IO}(avin::AVInput{T}, video_stream = 1) = seekstart(avin.io) -seekstart(avin::AVInput{T}, video_stream = 1) where {T<:IO} = throw(ErrorException("Sorry, Seeking is not supported from IO streams")) +seekstart(avin::AVInput{T}, video_stream=1) where {T <: IO} = throw(ErrorException("Sorry, Seeking is not supported from IO streams")) function eof(avin::AVInput) @@ -578,7 +578,7 @@ function eof(avin::AVInput) return !got_frame end -function eof(avin::AVInput{I}) where I<:IO +function eof(avin::AVInput{I}) where I <: IO !isopen(avin) && return true have_frame(avin) && return false return eof(avin.io) @@ -599,7 +599,7 @@ function close(avin::AVInput) !isopen && return for i in avin.listening - _close(avin.stream_contexts[i+1]) + _close(avin.stream_contexts[i + 1]) end # Fix for segmentation fault issue #44 @@ -631,7 +631,7 @@ if have_avdevice() camera_devices = String[] read_vid_devs = false - out,err = readall_stdout_stderr(`$ffmpeg -list_devices true -f $idev -i $idev_name`) + out, err = readall_stdout_stderr(`$ffmpeg -list_devices true -f $idev -i $idev_name`) buf = length(out) > 0 ? out : err for line in eachline(IOBuffer(buf)) if contains(line, "video devices") diff --git a/src/ffmpeg/AVCodecs/v53/LIBAVCODEC.jl b/src/ffmpeg/AVCodecs/v53/LIBAVCODEC.jl index f831623f..f1a86c2a 100644 --- a/src/ffmpeg/AVCodecs/v53/LIBAVCODEC.jl +++ b/src/ffmpeg/AVCodecs/v53/LIBAVCODEC.jl @@ -7,7 +7,7 @@ const AV_NOPTS_VALUE = reinterpret(Int64, 0x8000000000000000) function AVFrame() ns = fieldnames(AVFrame) ts = AVFrame.types - parms = [T<:Ptr ? C_NULL : zero(T) for T in ts] + parms = [T <: Ptr ? C_NULL : zero(T) for T in ts] fmt_pos = findfirst(ns, :format) parms[fmt_pos] = -one(ts[fmt_pos]) diff --git a/src/ffmpeg/AVUtil/v52/LIBAVUTIL.jl b/src/ffmpeg/AVUtil/v52/LIBAVUTIL.jl index 86cb0c3e..d657a743 100644 --- a/src/ffmpeg/AVUtil/v52/LIBAVUTIL.jl +++ b/src/ffmpeg/AVUtil/v52/LIBAVUTIL.jl @@ -26,7 +26,7 @@ include("pixdesc.jl") function AVFrame() ns = fieldnames(AVFrame) ts = AVFrame.types - parms = [T<:Ptr ? C_NULL : zero(T) for T in ts] + parms = [T <: Ptr ? C_NULL : zero(T) for T in ts] fmt_pos = findfirst(ns, :format) parms[fmt_pos] = -one(ts[fmt_pos]) diff --git a/src/libav/AVCodecs/v53/LIBAVCODEC.jl b/src/libav/AVCodecs/v53/LIBAVCODEC.jl index 3fc54e64..e59de545 100644 --- a/src/libav/AVCodecs/v53/LIBAVCODEC.jl +++ b/src/libav/AVCodecs/v53/LIBAVCODEC.jl @@ -5,7 +5,7 @@ include("avcodec.jl") function AVFrame() ns = fieldnames(AVFrame) ts = AVFrame.types - parms = [T<:Ptr ? C_NULL : zero(T) for T in ts] + parms = [T <: Ptr ? C_NULL : zero(T) for T in ts] fmt_pos = findfirst(ns, :format) parms[fmt_pos] = -one(ts[fmt_pos]) diff --git a/src/libav/AVCodecs/v54/LIBAVCODEC.jl b/src/libav/AVCodecs/v54/LIBAVCODEC.jl index 3fc54e64..e59de545 100644 --- a/src/libav/AVCodecs/v54/LIBAVCODEC.jl +++ b/src/libav/AVCodecs/v54/LIBAVCODEC.jl @@ -5,7 +5,7 @@ include("avcodec.jl") function AVFrame() ns = fieldnames(AVFrame) ts = AVFrame.types - parms = [T<:Ptr ? C_NULL : zero(T) for T in ts] + parms = [T <: Ptr ? C_NULL : zero(T) for T in ts] fmt_pos = findfirst(ns, :format) parms[fmt_pos] = -one(ts[fmt_pos]) diff --git a/src/libav/AVUtil/v53/LIBAVUTIL.jl b/src/libav/AVUtil/v53/LIBAVUTIL.jl index 5835b3af..932d6e15 100644 --- a/src/libav/AVUtil/v53/LIBAVUTIL.jl +++ b/src/libav/AVUtil/v53/LIBAVUTIL.jl @@ -22,7 +22,7 @@ include("pixdesc.jl") function AVFrame() ns = fieldnames(AVFrame) ts = AVFrame.types - parms = [T<:Ptr ? C_NULL : zero(T) for T in ts] + parms = [T <: Ptr ? C_NULL : zero(T) for T in ts] fmt_pos = findfirst(ns, :format) parms[fmt_pos] = -one(ts[fmt_pos]) diff --git a/src/util.jl b/src/util.jl index 690ba6ff..45d973bc 100644 --- a/src/util.jl +++ b/src/util.jl @@ -7,8 +7,8 @@ function av_setfield(s::Ptr{T}, name::Symbol, value) where T byteoffset = fieldoffset(T, field) S = T.types[field] - p = convert(Ptr{S}, s+byteoffset) - a = unsafe_wrap(Array, p,1) + p = convert(Ptr{S}, s + byteoffset) + a = unsafe_wrap(Array, p, 1) a[1] = convert(S, value) end From dae93749825749e0579bb3e89413f32bedf152e8 Mon Sep 17 00:00:00 2001 From: Kevin Squire Date: Mon, 27 Aug 2018 15:52:32 -0700 Subject: [PATCH 10/12] Add fieldposition function, fix findfirst deprecation * Previously, we were using findfirst to get the field position of a particular struct element. * Our use of findfirst was deprectated, so fix the deprecation * Additionally, reduce code duplication with a function, fieldposition, which returns the position of the field within a struct --- src/avio.jl | 4 ++-- src/ffmpeg/AVCodecs/v53/LIBAVCODEC.jl | 6 +++--- src/ffmpeg/AVUtil/v52/LIBAVUTIL.jl | 7 ++++--- src/ffmpeg/AVUtil/v54/LIBAVUTIL.jl | 6 +++--- src/ffmpeg/AVUtil/v55/LIBAVUTIL.jl | 6 +++--- src/libav/AVCodecs/v53/LIBAVCODEC.jl | 6 +++--- src/libav/AVCodecs/v54/LIBAVCODEC.jl | 6 +++--- src/libav/AVUtil/v53/LIBAVUTIL.jl | 6 +++--- src/util.jl | 18 +++++++++++++----- 9 files changed, 37 insertions(+), 28 deletions(-) diff --git a/src/avio.jl b/src/avio.jl index 395cdfc1..8c3fa78f 100644 --- a/src/avio.jl +++ b/src/avio.jl @@ -365,9 +365,9 @@ function retrieve(r::VideoReader{TRANSCODE}) # true=transcode end if t.target_bits_per_pixel == 8 - buf = permuteddimsview(Matrix{Gray{N0f8}}(r.width, r.height), (2,1)) + buf = permuteddimsview(Matrix{Gray{N0f8}}(undef, r.width, r.height), (2, 1)) else - buf = permuteddimsview(Matrix{RGB{N0f8}}(r.width, r.height), (2,1)) + buf = permuteddimsview(Matrix{RGB{N0f8}}(undef, r.width, r.height), (2, 1)) end retrieve!(r, buf) diff --git a/src/ffmpeg/AVCodecs/v53/LIBAVCODEC.jl b/src/ffmpeg/AVCodecs/v53/LIBAVCODEC.jl index f1a86c2a..7a32f0a5 100644 --- a/src/ffmpeg/AVCodecs/v53/LIBAVCODEC.jl +++ b/src/ffmpeg/AVCodecs/v53/LIBAVCODEC.jl @@ -1,3 +1,4 @@ +include("../../../util.jl") include("libavcodec_h.jl") include("avcodec.jl") @@ -5,14 +6,13 @@ include("avcodec.jl") const AV_NOPTS_VALUE = reinterpret(Int64, 0x8000000000000000) function AVFrame() - ns = fieldnames(AVFrame) ts = AVFrame.types parms = [T <: Ptr ? C_NULL : zero(T) for T in ts] - fmt_pos = findfirst(ns, :format) + fmt_pos = fieldposition(AVFrame, :format) parms[fmt_pos] = -one(ts[fmt_pos]) - pts_pos = findfirst(ns, :pts) + pts_pos = fieldposition(AVFrame, :pts) parms[pts_pos] = AV_NOPTS_VALUE AVFrame(parms...) diff --git a/src/ffmpeg/AVUtil/v52/LIBAVUTIL.jl b/src/ffmpeg/AVUtil/v52/LIBAVUTIL.jl index d657a743..9c9ff089 100644 --- a/src/ffmpeg/AVUtil/v52/LIBAVUTIL.jl +++ b/src/ffmpeg/AVUtil/v52/LIBAVUTIL.jl @@ -1,3 +1,4 @@ +include("../../../util.jl") include("libavutil_h.jl") #include("audio_fifo.jl") @@ -23,15 +24,15 @@ include("pixdesc.jl") #include("timecode.jl") #include("xtea.jl") + function AVFrame() - ns = fieldnames(AVFrame) ts = AVFrame.types parms = [T <: Ptr ? C_NULL : zero(T) for T in ts] - fmt_pos = findfirst(ns, :format) + fmt_pos = fieldposition(AVFrame, :format) parms[fmt_pos] = -one(ts[fmt_pos]) - pts_pos = findfirst(ns, :pts) + pts_pos = fieldposition(AVFrame, :pts) parms[pts_pos] = AV_NOPTS_VALUE AVFrame(parms...) diff --git a/src/ffmpeg/AVUtil/v54/LIBAVUTIL.jl b/src/ffmpeg/AVUtil/v54/LIBAVUTIL.jl index 763a3afc..5a24beaa 100644 --- a/src/ffmpeg/AVUtil/v54/LIBAVUTIL.jl +++ b/src/ffmpeg/AVUtil/v54/LIBAVUTIL.jl @@ -1,3 +1,4 @@ +include("../../../util.jl") include("libavutil_h.jl") #include("audio_fifo.jl") @@ -30,14 +31,13 @@ include("pixdesc.jl") #include("xtea.jl") function AVFrame() - ns = fieldnames(AVFrame) ts = AVFrame.types parms = [T <: Ptr ? C_NULL : zero(T) for T in ts] - fmt_pos = findfirst(ns, :format) + fmt_pos = fieldposition(AVFrame, :format) parms[fmt_pos] = -one(ts[fmt_pos]) - pts_pos = findfirst(ns, :pts) + pts_pos = fieldposition(AVFrame, :pts) parms[pts_pos] = AV_NOPTS_VALUE AVFrame(parms...) diff --git a/src/ffmpeg/AVUtil/v55/LIBAVUTIL.jl b/src/ffmpeg/AVUtil/v55/LIBAVUTIL.jl index 37573da5..dc63020c 100644 --- a/src/ffmpeg/AVUtil/v55/LIBAVUTIL.jl +++ b/src/ffmpeg/AVUtil/v55/LIBAVUTIL.jl @@ -1,3 +1,4 @@ +include("../../../util.jl") include("libavutil_h.jl") #include("aes_ctr.jl") @@ -39,14 +40,13 @@ include("pixdesc.jl") #include("xtea.jl") function AVFrame() - ns = fieldnames(AVFrame) ts = AVFrame.types parms = [T <: Ptr ? C_NULL : zero(T) for T in ts] - fmt_pos = findfirst(ns, :format) + fmt_pos = fieldposition(AVFrame, :format) parms[fmt_pos] = -one(ts[fmt_pos]) - pts_pos = findfirst(ns, :pts) + pts_pos = fieldposition(AVFrame, :pts) parms[pts_pos] = AV_NOPTS_VALUE AVFrame(parms...) diff --git a/src/libav/AVCodecs/v53/LIBAVCODEC.jl b/src/libav/AVCodecs/v53/LIBAVCODEC.jl index e59de545..4eee5716 100644 --- a/src/libav/AVCodecs/v53/LIBAVCODEC.jl +++ b/src/libav/AVCodecs/v53/LIBAVCODEC.jl @@ -1,16 +1,16 @@ +include("../../../util.jl") include("libavcodec_h.jl") include("avcodec.jl") function AVFrame() - ns = fieldnames(AVFrame) ts = AVFrame.types parms = [T <: Ptr ? C_NULL : zero(T) for T in ts] - fmt_pos = findfirst(ns, :format) + fmt_pos = fieldposition(AVFrame, :format) parms[fmt_pos] = -one(ts[fmt_pos]) - pts_pos = findfirst(ns, :pts) + pts_pos = fieldposition(AVFrame, :pts) parms[pts_pos] = AV_NOPTS_VALUE AVFrame(parms...) diff --git a/src/libav/AVCodecs/v54/LIBAVCODEC.jl b/src/libav/AVCodecs/v54/LIBAVCODEC.jl index e59de545..4eee5716 100644 --- a/src/libav/AVCodecs/v54/LIBAVCODEC.jl +++ b/src/libav/AVCodecs/v54/LIBAVCODEC.jl @@ -1,16 +1,16 @@ +include("../../../util.jl") include("libavcodec_h.jl") include("avcodec.jl") function AVFrame() - ns = fieldnames(AVFrame) ts = AVFrame.types parms = [T <: Ptr ? C_NULL : zero(T) for T in ts] - fmt_pos = findfirst(ns, :format) + fmt_pos = fieldposition(AVFrame, :format) parms[fmt_pos] = -one(ts[fmt_pos]) - pts_pos = findfirst(ns, :pts) + pts_pos = fieldposition(AVFrame, :pts) parms[pts_pos] = AV_NOPTS_VALUE AVFrame(parms...) diff --git a/src/libav/AVUtil/v53/LIBAVUTIL.jl b/src/libav/AVUtil/v53/LIBAVUTIL.jl index 932d6e15..48c08ecb 100644 --- a/src/libav/AVUtil/v53/LIBAVUTIL.jl +++ b/src/libav/AVUtil/v53/LIBAVUTIL.jl @@ -1,3 +1,4 @@ +include("../../../util.jl") include("libavutil_h.jl") #include("audio_fifo.jl") @@ -20,14 +21,13 @@ include("pixdesc.jl") #include("xtea.jl") function AVFrame() - ns = fieldnames(AVFrame) ts = AVFrame.types parms = [T <: Ptr ? C_NULL : zero(T) for T in ts] - fmt_pos = findfirst(ns, :format) + fmt_pos = fieldposition(AVFrame, :format) parms[fmt_pos] = -one(ts[fmt_pos]) - pts_pos = findfirst(ns, :pts) + pts_pos = fieldposition(AVFrame, :pts) parms[pts_pos] = AV_NOPTS_VALUE AVFrame(parms...) diff --git a/src/util.jl b/src/util.jl index 45d973bc..fb2fa4b7 100644 --- a/src/util.jl +++ b/src/util.jl @@ -1,11 +1,19 @@ # Helpful utility functions +function fieldposition(::Type{T}, name::Symbol) where T + field_pos = findfirst(isequal(name), fieldnames(T)) + if field_pos === nothing + throw(ErrorException("The type `$T` does not contain field $name!")) + end + return field_pos +end + # Set the value of a field of a pointer # Equivalent to s->name = value function av_setfield(s::Ptr{T}, name::Symbol, value) where T - field = findfirst(fieldnames(T), name) - byteoffset = fieldoffset(T, field) - S = T.types[field] + field_pos = fieldposition(T, name) + byteoffset = fieldoffset(T, field_pos) + S = T.types[field_pos] p = convert(Ptr{S}, s + byteoffset) a = unsafe_wrap(Array, p, 1) @@ -13,8 +21,8 @@ function av_setfield(s::Ptr{T}, name::Symbol, value) where T end function av_pointer_to_field(s::Ptr{T}, name::Symbol) where T - field = findfirst(fieldnames(T), name) - byteoffset = fieldoffset(T, field) + field_pos = fieldposition(T, name) + byteoffset = fieldoffset(T, field_pos) return s + byteoffset end From ff79e81acdda5b76e8bf4ea3ee9deaf453c5bb4f Mon Sep 17 00:00:00 2001 From: Kevin Squire Date: Mon, 27 Aug 2018 16:08:35 -0700 Subject: [PATCH 11/12] Fix assignment within array deprecation * In build.jl, we were assigning variable names inside of an array initialization * This is no longer allowed in Julia v1.0 --- deps/build.jl | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/deps/build.jl b/deps/build.jl index e0b7a850..ce816fbb 100644 --- a/deps/build.jl +++ b/deps/build.jl @@ -4,15 +4,14 @@ using BinDeps group = library_group("libav") -deps = [ - libavcodec = library_dependency("libavcodec", aliases=[["libavcodec-ffmpeg.so.","libavcodec.","libavcodec.so.","libavcodec.ffmpeg.so.","avcodec-"].*["53" "54" "55" "56"]...], group = group) - libavformat = library_dependency("libavformat", aliases=[["libavformat-ffmpeg.so.","libavformat.","libavformat.so.","libavformat.ffmpeg.so.","avformat-"].*["53" "54" "55" "56"]...], group = group) - libavutil = library_dependency("libavutil", aliases=[["libavutil-ffmpeg.so.", "libavutil.","libavutil.so.", "libavutil.ffmpeg.so.", "avutil-"].*["51" "52" "54"]...], group = group) - libswscale = library_dependency("libswscale", aliases=[["libswscale-ffmpeg.so.","libswscale.","libswscale.so.","libswscale.ffmpeg.so.","swscale-"].*["2" "3"]...], group = group) - libavfilter = library_dependency("libavfilter", aliases=[["libavfilter-ffmpeg.so.","libavfilter.","libavfilter.so.","libavfilter.ffmpeg.so.","avfilter-"].*["2" "3" "4" "5"]...], group = group) - libavdevice = library_dependency("libavdevice", aliases=[["libavdevice-ffmpeg.so.","libavdevice.","libavdevice.so.","libavdevice.ffmpeg.so.","avdevice-"].*["53" "54" "55" "56"]...], group = group) -] - +libavcodec = library_dependency("libavcodec", aliases=[["libavcodec-ffmpeg.so.","libavcodec.","libavcodec.so.","libavcodec.ffmpeg.so.","avcodec-"].*["53" "54" "55" "56"]...], group = group) +libavformat = library_dependency("libavformat", aliases=[["libavformat-ffmpeg.so.","libavformat.","libavformat.so.","libavformat.ffmpeg.so.","avformat-"].*["53" "54" "55" "56"]...], group = group) +libavutil = library_dependency("libavutil", aliases=[["libavutil-ffmpeg.so.", "libavutil.","libavutil.so.", "libavutil.ffmpeg.so.", "avutil-"].*["51" "52" "54"]...], group = group) +libswscale = library_dependency("libswscale", aliases=[["libswscale-ffmpeg.so.","libswscale.","libswscale.so.","libswscale.ffmpeg.so.","swscale-"].*["2" "3"]...], group = group) +libavfilter = library_dependency("libavfilter", aliases=[["libavfilter-ffmpeg.so.","libavfilter.","libavfilter.so.","libavfilter.ffmpeg.so.","avfilter-"].*["2" "3" "4" "5"]...], group = group) +libavdevice = library_dependency("libavdevice", aliases=[["libavdevice-ffmpeg.so.","libavdevice.","libavdevice.so.","libavdevice.ffmpeg.so.","avdevice-"].*["53" "54" "55" "56"]...], group = group) + +deps = [libavcodec, libavformat, libavutil, libswscale, libavfilter, libavdevice] libav_libs = [libavutil, libavcodec, libavformat, libavfilter, libswscale, libavdevice] # if (have_avresample = dlopen_e("libavresample") != C_NULL) From 7f3586aa5cdb1bd224392ad485db4aae0f7dd57a Mon Sep 17 00:00:00 2001 From: Kevin Squire Date: Mon, 27 Aug 2018 22:45:31 -0700 Subject: [PATCH 12/12] Update travis testing * Drop testing on v0.7 (tests pass on v1.0, and therefore should pass on v0.7) * Don't allow nightly to fail (yet) --- .travis.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6a8417e2..e50fef15 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,12 +20,11 @@ os: - linux # - osx julia: - - 0.7 - 1.0 - nightly -matrix: - allow_failures: - - julia: nightly +# matrix: +# allow_failures: +# - julia: nightly notifications: email: false # uncomment the following lines to override the default test script