| Message ID | 20230715193603.22215-1-pkoshevoy@gmail.com |
|---|---|
| State | Accepted |
| Commit | 35342dc390781f310daa53e6c850285863ab5829 |
| Headers | show |
| Series | [FFmpeg-devel] lavc/audiotoolbox: fix build failure on osx 10.5 (v3) | expand |
| Context | Check | Description |
|---|---|---|
| yinshiyou/make_loongarch64 | success | Make finished |
| yinshiyou/make_fate_loongarch64 | success | Make fate finished |
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
On 15 Jul 2023, at 21:36, Pavel Koshevoy wrote: > --- > libavcodec/audiotoolboxdec.c | 2 ++ > libavcodec/audiotoolboxenc.c | 4 ++++ > 2 files changed, 6 insertions(+) > > diff --git a/libavcodec/audiotoolboxdec.c b/libavcodec/audiotoolboxdec.c > index 82babe3d31..5456f916cf 100644 > --- a/libavcodec/audiotoolboxdec.c > +++ b/libavcodec/audiotoolboxdec.c > @@ -71,10 +71,12 @@ static UInt32 ffat_get_format_id(enum AVCodecID codec, int profile) > return kAudioFormatAMR; > case AV_CODEC_ID_EAC3: > return kAudioFormatEnhancedAC3; > +#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060 > case AV_CODEC_ID_GSM_MS: > return kAudioFormatMicrosoftGSM; > case AV_CODEC_ID_ILBC: > return kAudioFormatiLBC; > +#endif > case AV_CODEC_ID_MP1: > return kAudioFormatMPEGLayer1; > case AV_CODEC_ID_MP2: > diff --git a/libavcodec/audiotoolboxenc.c b/libavcodec/audiotoolboxenc.c > index 1ccfda4d20..46aca4c7ff 100644 > --- a/libavcodec/audiotoolboxenc.c > +++ b/libavcodec/audiotoolboxenc.c > @@ -69,15 +69,19 @@ static UInt32 ffat_get_format_id(enum AVCodecID codec, int profile) > return kAudioFormatMPEG4AAC_HE_V2; > case FF_PROFILE_AAC_LD: > return kAudioFormatMPEG4AAC_LD; > +#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060 > case FF_PROFILE_AAC_ELD: > return kAudioFormatMPEG4AAC_ELD; > +#endif > } > case AV_CODEC_ID_ADPCM_IMA_QT: > return kAudioFormatAppleIMA4; > case AV_CODEC_ID_ALAC: > return kAudioFormatAppleLossless; > +#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060 > case AV_CODEC_ID_ILBC: > return kAudioFormatiLBC; > +#endif > case AV_CODEC_ID_PCM_ALAW: > return kAudioFormatALaw; > case AV_CODEC_ID_PCM_MULAW: > -- > 2.35.3 Thanks, LGTM from my side though I can not push it as I have no commit access, so someone else has to do that. > > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
On 7/15/2023 4:54 PM, Marvin Scholz wrote: > > > On 15 Jul 2023, at 21:36, Pavel Koshevoy wrote: > >> --- >> libavcodec/audiotoolboxdec.c | 2 ++ >> libavcodec/audiotoolboxenc.c | 4 ++++ >> 2 files changed, 6 insertions(+) >> >> diff --git a/libavcodec/audiotoolboxdec.c b/libavcodec/audiotoolboxdec.c >> index 82babe3d31..5456f916cf 100644 >> --- a/libavcodec/audiotoolboxdec.c >> +++ b/libavcodec/audiotoolboxdec.c >> @@ -71,10 +71,12 @@ static UInt32 ffat_get_format_id(enum AVCodecID codec, int profile) >> return kAudioFormatAMR; >> case AV_CODEC_ID_EAC3: >> return kAudioFormatEnhancedAC3; >> +#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060 >> case AV_CODEC_ID_GSM_MS: >> return kAudioFormatMicrosoftGSM; >> case AV_CODEC_ID_ILBC: >> return kAudioFormatiLBC; >> +#endif >> case AV_CODEC_ID_MP1: >> return kAudioFormatMPEGLayer1; >> case AV_CODEC_ID_MP2: >> diff --git a/libavcodec/audiotoolboxenc.c b/libavcodec/audiotoolboxenc.c >> index 1ccfda4d20..46aca4c7ff 100644 >> --- a/libavcodec/audiotoolboxenc.c >> +++ b/libavcodec/audiotoolboxenc.c >> @@ -69,15 +69,19 @@ static UInt32 ffat_get_format_id(enum AVCodecID codec, int profile) >> return kAudioFormatMPEG4AAC_HE_V2; >> case FF_PROFILE_AAC_LD: >> return kAudioFormatMPEG4AAC_LD; >> +#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060 >> case FF_PROFILE_AAC_ELD: >> return kAudioFormatMPEG4AAC_ELD; >> +#endif >> } >> case AV_CODEC_ID_ADPCM_IMA_QT: >> return kAudioFormatAppleIMA4; >> case AV_CODEC_ID_ALAC: >> return kAudioFormatAppleLossless; >> +#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060 >> case AV_CODEC_ID_ILBC: >> return kAudioFormatiLBC; >> +#endif >> case AV_CODEC_ID_PCM_ALAW: >> return kAudioFormatALaw; >> case AV_CODEC_ID_PCM_MULAW: >> -- >> 2.35.3 > > Thanks, LGTM from my side though I can not push it > as I have no commit access, so someone else has to > do that. Applied.
diff --git a/libavcodec/audiotoolboxdec.c b/libavcodec/audiotoolboxdec.c index 82babe3d31..5456f916cf 100644 --- a/libavcodec/audiotoolboxdec.c +++ b/libavcodec/audiotoolboxdec.c @@ -71,10 +71,12 @@ static UInt32 ffat_get_format_id(enum AVCodecID codec, int profile) return kAudioFormatAMR; case AV_CODEC_ID_EAC3: return kAudioFormatEnhancedAC3; +#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060 case AV_CODEC_ID_GSM_MS: return kAudioFormatMicrosoftGSM; case AV_CODEC_ID_ILBC: return kAudioFormatiLBC; +#endif case AV_CODEC_ID_MP1: return kAudioFormatMPEGLayer1; case AV_CODEC_ID_MP2: diff --git a/libavcodec/audiotoolboxenc.c b/libavcodec/audiotoolboxenc.c index 1ccfda4d20..46aca4c7ff 100644 --- a/libavcodec/audiotoolboxenc.c +++ b/libavcodec/audiotoolboxenc.c @@ -69,15 +69,19 @@ static UInt32 ffat_get_format_id(enum AVCodecID codec, int profile) return kAudioFormatMPEG4AAC_HE_V2; case FF_PROFILE_AAC_LD: return kAudioFormatMPEG4AAC_LD; +#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060 case FF_PROFILE_AAC_ELD: return kAudioFormatMPEG4AAC_ELD; +#endif } case AV_CODEC_ID_ADPCM_IMA_QT: return kAudioFormatAppleIMA4; case AV_CODEC_ID_ALAC: return kAudioFormatAppleLossless; +#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060 case AV_CODEC_ID_ILBC: return kAudioFormatiLBC; +#endif case AV_CODEC_ID_PCM_ALAW: return kAudioFormatALaw; case AV_CODEC_ID_PCM_MULAW: