diff --git a/Scripts/ffmpeg-build-arm64.sh b/Scripts/ffmpeg-build-arm64.sh index 3d5824e04..49a72b15d 100755 --- a/Scripts/ffmpeg-build-arm64.sh +++ b/Scripts/ffmpeg-build-arm64.sh @@ -25,12 +25,13 @@ ADPCM_CODECS=adpcm_4xm,adpcm_adx,adpcm_afx,adpcm_agm,adpcm_aica,adpcm_argo,adpcm --enable-pic --enable-gpl --disable-doc --disable-ffplay\ --disable-ffprobe --disable-avdevice --disable-ffmpeg\ --disable-postproc --disable-avfilter\ - --disable-swscale --disable-network --disable-swscale-alpha --disable-vdpau\ + --disable-swscale --enable-network --disable-swscale-alpha --disable-vdpau\ --disable-dxva2 --disable-everything --enable-hwaccels\ --enable-swresample\ + --enable-protocol=tcp,tls,http,https,icecast\ --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,spdif,mpc,mpc8,rm,matroska,tta,$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,tta,$PCM_CODECS,$ADPCM_CODECS\ + --enable-demuxer=hls,mpegts,mpegtsraw,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,tta,$PCM_CODECS,$ADPCM_CODECS\ + --enable-decoder=ac3,ac3_t,eac3,wmapro,wmav1,wmav2,wmavoice,wmalossless,xma1,xma2,dca,tak,dsd_lsbf,dsd_lsbf_planar,dsd_mbf,dsd_msbf_planar,aac,libfdk_aac,atrac3,atrac3p,mp3float,mp2float,mp1float,bink,binkaudio_dct,binkaudio_rdft,flac,vorbis,ape,smackaud,opus,mpc7,mpc8,alac,cook,tta,$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 8e9173160..ffc1fecc7 100755 --- a/Scripts/ffmpeg-build-x86_64.sh +++ b/Scripts/ffmpeg-build-x86_64.sh @@ -23,12 +23,13 @@ ADPCM_CODECS=adpcm_4xm,adpcm_adx,adpcm_afx,adpcm_agm,adpcm_aica,adpcm_argo,adpcm --enable-pic --enable-gpl --disable-doc --disable-ffplay\ --disable-ffprobe --disable-avdevice --disable-ffmpeg\ --disable-postproc --disable-avfilter\ - --disable-swscale --disable-network --disable-swscale-alpha --disable-vdpau\ + --disable-swscale --enable-network --disable-swscale-alpha --disable-vdpau\ --disable-dxva2 --disable-everything --enable-hwaccels\ --enable-swresample\ + --enable-protocol=tcp,tls,http,https,icecast,hls\ --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,spdif,mpc,mpc8,rm,matroska,tta,$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,tta,$PCM_CODECS,$ADPCM_CODECS\ + --enable-demuxer=hls,mpegts,mpegtsraw,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,tta,$PCM_CODECS,$ADPCM_CODECS\ + --enable-decoder=ac3,ac3_t,eac3,wmapro,wmav1,wmav2,wmavoice,wmalossless,xma1,xma2,dca,tak,dsd_lsbf,dsd_lsbf_planar,dsd_mbf,dsd_msbf_planar,aac,libfdk_aac,atrac3,atrac3p,mp3float,mp2float,mp1float,bink,binkaudio_dct,binkaudio_rdft,flac,vorbis,ape,smackaud,opus,mpc7,mpc8,alac,cook,tta,$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.59.dylib b/ThirdParty/ffmpeg/lib/libavcodec.59.dylib index a574e2da4..2d23e7124 100755 Binary files a/ThirdParty/ffmpeg/lib/libavcodec.59.dylib and b/ThirdParty/ffmpeg/lib/libavcodec.59.dylib differ diff --git a/ThirdParty/ffmpeg/lib/libavformat.59.dylib b/ThirdParty/ffmpeg/lib/libavformat.59.dylib index 73d53b71e..13fc51b49 100755 Binary files a/ThirdParty/ffmpeg/lib/libavformat.59.dylib and b/ThirdParty/ffmpeg/lib/libavformat.59.dylib differ diff --git a/ThirdParty/ffmpeg/lib/libavutil.57.dylib b/ThirdParty/ffmpeg/lib/libavutil.57.dylib index 84422c71f..257182b30 100755 Binary files a/ThirdParty/ffmpeg/lib/libavutil.57.dylib and b/ThirdParty/ffmpeg/lib/libavutil.57.dylib differ diff --git a/ThirdParty/ffmpeg/lib/libswresample.4.dylib b/ThirdParty/ffmpeg/lib/libswresample.4.dylib index 7cc40d986..59b354025 100755 Binary files a/ThirdParty/ffmpeg/lib/libswresample.4.dylib and b/ThirdParty/ffmpeg/lib/libswresample.4.dylib differ