[FFmpeg-devel] [PATCH] lavc/audiotoolbox: fix build failure on osx 10.5 (v2)

[Pavel Koshevoy]

On Sat, Jul 15, 2023 at 10:11 AM Marvin Scholz <epirat07 at gmail.com> wrote:

> On 15 Jul 2023, at 17:40, Pavel Koshevoy wrote:
>
> > ---
> >  libavcodec/audiotoolboxdec.c | 2 ++
> >  libavcodec/audiotoolboxenc.c | 4 ++++
> >  2 files changed, 6 insertions(+)
> >
>
> Hi, thanks for the patch, small remark below:
>
> > diff --git a/libavcodec/audiotoolboxdec.c b/libavcodec/audiotoolboxdec.c
> > index 82babe3d31..e336aade8b 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 __ENVIRONMENT_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..e5217d952d 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 __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 1060
>
> I think you should use __MAC_OS_X_VERSION_MIN_REQUIRED, as the
> __ENVIRONMENT_* is
> an implementation detail and not documented IIRC. (Same below)
>


Okay, I've sent v3 with MAC_OS_X_VERSION_MIN_REQUIRED.

Thank you,
    Pavel.