[FFmpeg-devel] [PATCH] lavc/audiotoolboxdec: fix OSX SDK detection

Rodger Combs rodger.combs at gmail.com
Tue Sep 6 07:05:10 EEST 2016


> On Sep 5, 2016, at 22:58, Dmitry Kalinkin <dmitry.kalinkin at gmail.com> wrote:
> 
> __MAC_10_11 can be present in updated revision of an older SDK so it
> can't reliably detect availability of kAudioFormatEnhancedAC3 constant.
> 
> Fixes: b4daa2c40f ('lavc/audiotoolboxdec: add eac3 decoder')
> Cc: Rodger Combs <rodger.combs at gmail.com>
> Signed-off-by: Dmitry Kalinkin <dmitry.kalinkin at gmail.com>
> ---
> libavcodec/audiotoolboxdec.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/libavcodec/audiotoolboxdec.c b/libavcodec/audiotoolboxdec.c
> index 1097668..bba6913 100644
> --- a/libavcodec/audiotoolboxdec.c
> +++ b/libavcodec/audiotoolboxdec.c
> @@ -32,7 +32,7 @@
> #include "libavutil/opt.h"
> #include "libavutil/log.h"
> 
> -#ifndef __MAC_10_11
> +#ifndef __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
> #define kAudioFormatEnhancedAC3 'ec-3'
> #endif
> 
> -- 
> 2.7.4 (Apple Git-66)
> 

We shouldn't use the MIN_REQUIRED macro here, since the runtime availability isn't affected by the minimum version we're building against.
There might be a better macro available for this, but since the original definition is in an enum, our best bet might just be to make this #define unconditional.


More information about the ffmpeg-devel mailing list