diff --git a/Scripts/ffmpeg-build-arm64.sh b/Scripts/ffmpeg-build-arm64.sh index dff5e9136..66c38f546 100755 --- a/Scripts/ffmpeg-build-arm64.sh +++ b/Scripts/ffmpeg-build-arm64.sh @@ -6,6 +6,9 @@ export CPATH=/opt/homebrew/include export LIBRARY_PATH=/opt/homebrew/lib export PATH=/opt/homebrew/bin:$PATH +PCM_CODECS=pcm_alaw,pcm_bluray,pcm_dvd,pcm_f16le,pcm_f24le,pcm_f32be,pcm_f32le,pcm_f64be,pcm_f64le,pcm_lxf,pcm_mulaw,pcm_s8,pcm_s8_planar,pcm_s16be,pcm_s16be_planar,pcm_s16le,pcm_s16le_planar,pcm_s24be,pcm_s24daud,pcm_s24le,pcm_s24le_planar,pcm_s32be,pcm_s32le,pcm_s32le_planar,pcm_s64be,pcm_s64le,pcm_sga,pcm_u8pcm_u16be,pcm_u16le,pcm_u24be,pcm_u24le,pcm_u32be,pcm_u32le,pcm_vidc +ADPCM_CODECS=adpcm_4xm,adpcm_adx,adpcm_afx,adpcm_agm,adpcm_aica,adpcm_argo,adpcm_ct,adpcm_dtk,adpcm_ea,adpcm_ea_maxis_xa,adpcm_ea_r1,adpcm_ea_r2,adpcm_ea_r3,adpcm_ea_xa,adpcm_g722,adpcm_g726,adpcm_g726le,adpcm_ima_amv,adpcm_ima_alp,adpcm_ima_apc,adpcm_ima_apm,adpcm_ima_cunning,adpcm_ima_dat4,adppcm_ima_dk3,adpcm_ima_dk4,adpcm_ima_ea_eacs,adpcm_ima_ea_sead,adpcm_ima_iss,adpcm_ima_moflex,adpcm_ima_mtf,adpcm_ima_oki,adpcm_ima_qt,adpcm_ima_rad,adpcm_ima_ssi,adpcm_ima_smjpeg,adpcm_ima_wav,adpcm_ima_ws,adpcm_ms,adpcm_mtaf,adpcm_psx,adpcm_sbpro_2,adpcm_sbpro_3,adpcm_sbpro_4,adpcm_swf,adpcm_thp,adpcm_thp_le,adpcm_vima,adpcm_xa,adpcm_yamaha,adpcm_zork + # This is the commands used to build the ffmpeg libs provided here ./configure\ --enable-cross-compile\ @@ -26,8 +29,8 @@ export PATH=/opt/homebrew/bin:$PATH --disable-dxva2 --disable-everything --enable-hwaccels\ --enable-swresample\ --enable-parser=ac3,mpegaudio,xma,vorbis,opus\ - --enable-demuxer=ac3,asf,xwma,mov,oma,ogg,tak,dsf,wav,w64,aac,dts,dtshd,eac3,mp3,bink,flac,msf,xmv,caf,ape,smacker,pcm_s8,spdif,mpc,mpc8,rm,matroska\ - --enable-decoder=ac3,ac3_t,eac3,eac3_at,wmapro,wmav1,wmav2,wmavoice,wmalossless,xma1,xma2,dca,tak,dsd_lsbf,dsd_lsbf_planar,dsd_mbf,dsd_msbf_planar,aac,aac_at,libfdk_aac,atrac3,atrac3p,mp3float,mp3_at,mp2float,mp2_at,mp1float,mp1_at,bink,binkaudio_dct,binkaudio_rdft,flac,pcm_s16be,pcm_s16be_planar,pcm_s16le,pcm_s16le_planar,vorbis,ape,adpcm_ima_qt,smackaud,opus,pcm_s8,pcm_s8_planar,mpc7,mpc8,alac,alac_at,adpcm_ima_dk3,adpcm_ima_dk4,cook\ + --enable-demuxer=ac3,asf,xwma,mov,oma,ogg,tak,dsf,wav,w64,aac,dts,dtshd,eac3,mp3,bink,flac,msf,xmv,caf,ape,smacker,spdif,mpc,mpc8,rm,matroska,$PCM_CODECS,$ADPCM_CODECS\ + --enable-decoder=ac3,ac3_t,eac3,eac3_at,wmapro,wmav1,wmav2,wmavoice,wmalossless,xma1,xma2,dca,tak,dsd_lsbf,dsd_lsbf_planar,dsd_mbf,dsd_msbf_planar,aac,aac_at,libfdk_aac,atrac3,atrac3p,mp3float,mp3_at,mp2float,mp2_at,mp1float,mp1_at,bink,binkaudio_dct,binkaudio_rdft,flac,vorbis,ape,smackaud,opus,mpc7,mpc8,alac,alac_at,cook,$PCM_CODECS,$ADPCM_CODECS\ --disable-parser=mpeg4video,h263\ --disable-decoder=mpeg2video,h263,h264,mpeg1video,mpeg2video,mpeg4,hevc,vp9\ --disable-version3 diff --git a/Scripts/ffmpeg-build-x86_64.sh b/Scripts/ffmpeg-build-x86_64.sh index 5ad7f4148..ca5958f44 100755 --- a/Scripts/ffmpeg-build-x86_64.sh +++ b/Scripts/ffmpeg-build-x86_64.sh @@ -6,6 +6,9 @@ export CPATH=/usr/local/include export LIBRARY_PATH=/usr/local/lib export PATH=/usr/local/bin:$PATH +PCM_CODECS=pcm_alaw,pcm_bluray,pcm_dvd,pcm_f16le,pcm_f24le,pcm_f32be,pcm_f32le,pcm_f64be,pcm_f64le,pcm_lxf,pcm_mulaw,pcm_s8,pcm_s8_planar,pcm_s16be,pcm_s16be_planar,pcm_s16le,pcm_s16le_planar,pcm_s24be,pcm_s24daud,pcm_s24le,pcm_s24le_planar,pcm_s32be,pcm_s32le,pcm_s32le_planar,pcm_s64be,pcm_s64le,pcm_sga,pcm_u8pcm_u16be,pcm_u16le,pcm_u24be,pcm_u24le,pcm_u32be,pcm_u32le,pcm_vidc +ADPCM_CODECS=adpcm_4xm,adpcm_adx,adpcm_afx,adpcm_agm,adpcm_aica,adpcm_argo,adpcm_ct,adpcm_dtk,adpcm_ea,adpcm_ea_maxis_xa,adpcm_ea_r1,adpcm_ea_r2,adpcm_ea_r3,adpcm_ea_xa,adpcm_g722,adpcm_g726,adpcm_g726le,adpcm_ima_amv,adpcm_ima_alp,adpcm_ima_apc,adpcm_ima_apm,adpcm_ima_cunning,adpcm_ima_dat4,adppcm_ima_dk3,adpcm_ima_dk4,adpcm_ima_ea_eacs,adpcm_ima_ea_sead,adpcm_ima_iss,adpcm_ima_moflex,adpcm_ima_mtf,adpcm_ima_oki,adpcm_ima_qt,adpcm_ima_rad,adpcm_ima_ssi,adpcm_ima_smjpeg,adpcm_ima_wav,adpcm_ima_ws,adpcm_ms,adpcm_mtaf,adpcm_psx,adpcm_sbpro_2,adpcm_sbpro_3,adpcm_sbpro_4,adpcm_swf,adpcm_thp,adpcm_thp_le,adpcm_vima,adpcm_xa,adpcm_yamaha,adpcm_zork + # This is the commands used to build the ffmpeg libs provided here ./configure\ --arch=x86_64\ @@ -24,8 +27,8 @@ export PATH=/usr/local/bin:$PATH --disable-dxva2 --disable-everything --enable-hwaccels\ --enable-swresample\ --enable-parser=ac3,mpegaudio,xma,vorbis,opus\ - --enable-demuxer=ac3,asf,xwma,mov,oma,ogg,tak,dsf,wav,w64,aac,dts,dtshd,eac3,mp3,bink,flac,msf,xmv,caf,ape,smacker,pcm_s8,spdif,mpc,mpc8,rm,matroska\ - --enable-decoder=ac3,ac3_t,eac3,eac3_at,wmapro,wmav1,wmav2,wmavoice,wmalossless,xma1,xma2,dca,tak,dsd_lsbf,dsd_lsbf_planar,dsd_mbf,dsd_msbf_planar,aac,aac_at,libfdk_aac,atrac3,atrac3p,mp3float,mp3_at,mp2float,mp2_at,mp1float,mp1_at,bink,binkaudio_dct,binkaudio_rdft,flac,pcm_s16be,pcm_s16be_planar,pcm_s16le,pcm_s16le_planar,vorbis,ape,adpcm_ima_qt,smackaud,opus,pcm_s8,pcm_s8_planar,mpc7,mpc8,alac,alac_at,adpcm_ima_dk3,adpcm_ima_dk4,cook\ + --enable-demuxer=ac3,asf,xwma,mov,oma,ogg,tak,dsf,wav,w64,aac,dts,dtshd,eac3,mp3,bink,flac,msf,xmv,caf,ape,smacker,spdif,mpc,mpc8,rm,matroska,$PCM_CODECS,$ADPCM_CODECS\ + --enable-decoder=ac3,ac3_t,eac3,eac3_at,wmapro,wmav1,wmav2,wmavoice,wmalossless,xma1,xma2,dca,tak,dsd_lsbf,dsd_lsbf_planar,dsd_mbf,dsd_msbf_planar,aac,aac_at,libfdk_aac,atrac3,atrac3p,mp3float,mp3_at,mp2float,mp2_at,mp1float,mp1_at,bink,binkaudio_dct,binkaudio_rdft,flac,vorbis,ape,smackaud,opus,mpc7,mpc8,alac,alac_at,cook,$PCM_CODECS,$ADPCM_CODECS\ --disable-parser=mpeg4video,h263\ --disable-decoder=mpeg2video,h263,h264,mpeg1video,mpeg2video,mpeg4,hevc,vp9\ --disable-version3 diff --git a/ThirdParty/ffmpeg/lib/libavcodec.58.dylib b/ThirdParty/ffmpeg/lib/libavcodec.58.dylib index d8bd052da..9a198affd 100755 Binary files a/ThirdParty/ffmpeg/lib/libavcodec.58.dylib and b/ThirdParty/ffmpeg/lib/libavcodec.58.dylib differ diff --git a/ThirdParty/ffmpeg/lib/libavformat.58.dylib b/ThirdParty/ffmpeg/lib/libavformat.58.dylib index f4d822f05..57c456252 100755 Binary files a/ThirdParty/ffmpeg/lib/libavformat.58.dylib and b/ThirdParty/ffmpeg/lib/libavformat.58.dylib differ diff --git a/ThirdParty/ffmpeg/lib/libavutil.56.dylib b/ThirdParty/ffmpeg/lib/libavutil.56.dylib index 789835daf..e5581d1a3 100755 Binary files a/ThirdParty/ffmpeg/lib/libavutil.56.dylib and b/ThirdParty/ffmpeg/lib/libavutil.56.dylib differ diff --git a/ThirdParty/ffmpeg/lib/libswresample.3.dylib b/ThirdParty/ffmpeg/lib/libswresample.3.dylib index 732f1ae02..d4ac0121e 100755 Binary files a/ThirdParty/ffmpeg/lib/libswresample.3.dylib and b/ThirdParty/ffmpeg/lib/libswresample.3.dylib differ