| Message ID | 000ad509-d87c-565b-312e-aaa85d587e47@mail.de |
|---|---|
| State | New |
| Headers | show |
| Series | [FFmpeg-devel] lavc/videotoolboxenc.c: Fix preprocessor macro for OSX, 10.10.5 and probably older versions | expand |
| Context | Check | Description |
|---|---|---|
| andriy/x86_make | success | Make finished |
| andriy/x86_make_fate | success | Make fate finished |
| andriy/PPC64_make | success | Make finished |
| andriy/PPC64_make_fate | success | Make fate finished |
> Am 14.06.2021 um 15:03 schrieb Thilo Borgmann <thilo.borgmann@mail.de>: > > Hi, > > TARGET_OS_OSX exists since OSX 10.10.6. TARGET_OS_MAC is there on both sides of 10.10.6. Fixes compilation on Yosemite. > Hi Thilo, TARGET_OS_MAC is 1 when building for iOS as well, you need !TARGET_OS_IPHONE instead. > -Thilo > <0001-lavc-videotoolboxenc.c-Fix-preprocessor-macro-for-OS.patch> > _______________________________________________ > 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".
Am 14.06.21 um 15:14 schrieb Marvin Scholz (ePirat): > >> Am 14.06.2021 um 15:03 schrieb Thilo Borgmann <thilo.borgmann@mail.de>: >> >> Hi, >> >> TARGET_OS_OSX exists since OSX 10.10.6. TARGET_OS_MAC is there on both sides of 10.10.6. Fixes compilation on Yosemite. >> > > Hi Thilo, TARGET_OS_MAC is 1 when building for iOS as well, you need !TARGET_OS_IPHONE instead. I thought so as well and other projects doing it that way. The original author suggested _OS_MAC though. I'll apply with !TARGET_OS_IPHONE. Thanks! Thilo >> -Thilo >> <0001-lavc-videotoolboxenc.c-Fix-preprocessor-macro-for-OS.patch> >> _______________________________________________ >> 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". > _______________________________________________ > 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". >
diff --git a/libavcodec/videotoolboxenc.c b/libavcodec/videotoolboxenc.c index f063a86..888b6d6c 100644 --- a/libavcodec/videotoolboxenc.c +++ b/libavcodec/videotoolboxenc.c @@ -1038,7 +1038,7 @@ static int get_cv_ycbcr_matrix(AVCodecContext *avctx, CFStringRef *matrix) { // constant quality only on Macs with Apple Silicon static bool vtenc_qscale_enabled(void) { - return TARGET_OS_OSX && TARGET_CPU_ARM64; + return TARGET_OS_MAC && TARGET_CPU_ARM64; } static int vtenc_create_encoder(AVCodecContext *avctx,
Hi, TARGET_OS_OSX exists since OSX 10.10.6. TARGET_OS_MAC is there on both sides of 10.10.6. Fixes compilation on Yosemite. -Thilo From a6c690c8f1d311995c6511fcd22982ff1f4c5949 Mon Sep 17 00:00:00 2001 From: Thilo Borgmann <thilo.borgmann@mail.de> Date: Mon, 14 Jun 2021 14:51:13 +0200 Subject: [PATCH] lavc/videotoolboxenc.c: Fix preprocessor macro for OSX 10.10.5 and probably older versions --- libavcodec/videotoolboxenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)