Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
 help / color / mirror / Atom feed
From: James Almer <jamrial@gmail.com>
To: ffmpeg-devel@ffmpeg.org
Subject: Re: [FFmpeg-devel] [PATCH] lavc/audiotoolbox: fix build failure on osx 10.5 (v3)
Date: Sat, 15 Jul 2023 19:58:31 -0300
Message-ID: <e3f98e7f-830b-7f29-93be-649987117400@gmail.com> (raw)
In-Reply-To: <08860546-3228-4E6F-833D-787B47EE94CD@gmail.com>

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.
_______________________________________________
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".

      reply	other threads:[~2023-07-15 22:58 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-07-15 19:36 Pavel Koshevoy
2023-07-15 19:54 ` Marvin Scholz
2023-07-15 22:58   ` James Almer [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=e3f98e7f-830b-7f29-93be-649987117400@gmail.com \
    --to=jamrial@gmail.com \
    --cc=ffmpeg-devel@ffmpeg.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
		ffmpegdev@gitmailbox.com
	public-inbox-index ffmpegdev

Example config snippet for mirrors.


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git