diff --git a/Info.plist b/Info.plist
index d4b014446..3ed4c1fa7 100644
--- a/Info.plist
+++ b/Info.plist
@@ -929,6 +929,21 @@
 			<key>LSTypeIsPackage</key>
 			<false/>
 		</dict>
+		<dict>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>aiff</string>
+				<string>aif</string>
+			</array>
+			<key>CFBundleTypeIconFile</key>
+			<string>aiff.icns</string>
+			<key>CFBundleTypeName</key>
+			<string>Audio Interchange File Format</string>
+			<key>CFBundleTypeRole</key>
+			<string>Viewer</string>
+			<key>LSTypeIsPackage</key>
+			<false/>
+		</dict>
 		<dict>
 			<key>CFBundleTypeExtensions</key>
 			<array>
diff --git a/Plugins/FFMPEG/FFMPEGDecoder.m b/Plugins/FFMPEG/FFMPEGDecoder.m
index 072bf34b9..37d5d2484 100644
--- a/Plugins/FFMPEG/FFMPEGDecoder.m
+++ b/Plugins/FFMPEG/FFMPEGDecoder.m
@@ -911,7 +911,7 @@ static uint8_t reverse_bits[0x100];
 }
 
 + (NSArray *)fileTypes {
-	return @[@"wma", @"asf", @"tak", @"mp4", @"m4a", @"aac", @"mp3", @"mp2", @"m2a", @"mpa", @"ape", @"ac3", @"dts", @"dtshd", @"wav", @"tta", @"vqf", @"vqe", @"vql", @"ra", @"rm", @"rmj", @"mka", @"weba", @"dff", @"iff", @"dsdiff", @"wsd"];
+	return @[@"wma", @"asf", @"tak", @"mp4", @"m4a", @"aac", @"mp3", @"mp2", @"m2a", @"mpa", @"ape", @"ac3", @"dts", @"dtshd", @"wav", @"tta", @"vqf", @"vqe", @"vql", @"ra", @"rm", @"rmj", @"mka", @"weba", @"dff", @"iff", @"dsdiff", @"wsd", @"aiff", @"aif"];
 }
 
 + (NSArray *)mimeTypes {
@@ -936,7 +936,8 @@ static uint8_t reverse_bits[0x100];
 		@[@"WebM Audio File", @"song.icns", @"weba"],
 		@[@"DSD Stream File", @"song.icns", @"dsf"],
 		@[@"Interchange File Format", @"song.icns", @"iff", @"dsdiff"],
-		@[@"Wideband Single-bit Data", @"song.icns", @"wsd"]
+		@[@"Wideband Single-bit Data", @"song.icns", @"wsd"],
+		@[@"Audio Interchange File Format", @"aiff.icns", @"aiff", @"aif"]
 	];
 }
 
diff --git a/Scripts/ffmpeg-build-arm64.sh b/Scripts/ffmpeg-build-arm64.sh
index 95c387c77..478a29c52 100755
--- a/Scripts/ffmpeg-build-arm64.sh
+++ b/Scripts/ffmpeg-build-arm64.sh
@@ -30,7 +30,7 @@ ADPCM_CODECS=adpcm_4xm,adpcm_adx,adpcm_afx,adpcm_agm,adpcm_aica,adpcm_argo,adpcm
     --enable-swresample\
     --enable-protocol=tcp,tls,http,https,icecast\
     --enable-parser=ac3,mpegaudio,xma,vorbis,opus\
-    --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,dff,wsd,iff,$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,dff,wsd,iff,aiff,$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\
diff --git a/Scripts/ffmpeg-build-x86_64.sh b/Scripts/ffmpeg-build-x86_64.sh
index d56f8faf3..f066c16f8 100755
--- a/Scripts/ffmpeg-build-x86_64.sh
+++ b/Scripts/ffmpeg-build-x86_64.sh
@@ -28,7 +28,7 @@ ADPCM_CODECS=adpcm_4xm,adpcm_adx,adpcm_afx,adpcm_agm,adpcm_aica,adpcm_argo,adpcm
     --enable-swresample\
     --enable-protocol=tcp,tls,http,https,icecast,hls\
     --enable-parser=ac3,mpegaudio,xma,vorbis,opus\
-    --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,dff,wsd,iff,$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,dff,wsd,iff,aiff,$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\
diff --git a/ThirdParty/ffmpeg/lib/libavcodec.59.dylib b/ThirdParty/ffmpeg/lib/libavcodec.59.dylib
index 8386d0d80..5df48d335 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 00318ac23..a07af9ab4 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 f3c7bb577..a454e4ab3 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 169bc88ab..d5d753185 100755
Binary files a/ThirdParty/ffmpeg/lib/libswresample.4.dylib and b/ThirdParty/ffmpeg/lib/libswresample.4.dylib differ