highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lavc/audiotoolbox: fix build failure on osx 10.5 (v3)

Browse Source 
Reviewed-by: Marvin Scholz <epirat07@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
Pavel Koshevoy
2023-07-15 13:36:03 -06:00
committed by James Almer
parent e047d9c62b
commit 35342dc390
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/audiotoolboxdec.c
View File

@@ -71,10 +71,12 @@ static UInt32 ffat_get_format_id(enum AVCodecID codec, int profile)
return kAudioFormatAMR; return kAudioFormatAMR;
case AV_CODEC_ID_EAC3: case AV_CODEC_ID_EAC3:
return kAudioFormatEnhancedAC3; return kAudioFormatEnhancedAC3;
#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
case AV_CODEC_ID_GSM_MS: case AV_CODEC_ID_GSM_MS:
return kAudioFormatMicrosoftGSM; return kAudioFormatMicrosoftGSM;
case AV_CODEC_ID_ILBC: case AV_CODEC_ID_ILBC:
return kAudioFormatiLBC; return kAudioFormatiLBC;
#endif
case AV_CODEC_ID_MP1: case AV_CODEC_ID_MP1:
return kAudioFormatMPEGLayer1; return kAudioFormatMPEGLayer1;
case AV_CODEC_ID_MP2: case AV_CODEC_ID_MP2:

4
libavcodec/audiotoolboxenc.c
View File

@@ -69,15 +69,19 @@ static UInt32 ffat_get_format_id(enum AVCodecID codec, int profile)
return kAudioFormatMPEG4AAC_HE_V2; return kAudioFormatMPEG4AAC_HE_V2;
case FF_PROFILE_AAC_LD: case FF_PROFILE_AAC_LD:
return kAudioFormatMPEG4AAC_LD; return kAudioFormatMPEG4AAC_LD;
#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
case FF_PROFILE_AAC_ELD: case FF_PROFILE_AAC_ELD:
return kAudioFormatMPEG4AAC_ELD; return kAudioFormatMPEG4AAC_ELD;
#endif
} }
case AV_CODEC_ID_ADPCM_IMA_QT: case AV_CODEC_ID_ADPCM_IMA_QT:
return kAudioFormatAppleIMA4; return kAudioFormatAppleIMA4;
case AV_CODEC_ID_ALAC: case AV_CODEC_ID_ALAC:
return kAudioFormatAppleLossless; return kAudioFormatAppleLossless;
#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
case AV_CODEC_ID_ILBC: case AV_CODEC_ID_ILBC:
return kAudioFormatiLBC; return kAudioFormatiLBC;
#endif
case AV_CODEC_ID_PCM_ALAW: case AV_CODEC_ID_PCM_ALAW:
return kAudioFormatALaw; return kAudioFormatALaw;
case AV_CODEC_ID_PCM_MULAW: case AV_CODEC_ID_PCM_MULAW: