From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <ffmpeg-devel-bounces@ffmpeg.org>
Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100])
by master.gitmailbox.com (Postfix) with ESMTPS id 609484B555
for <ffmpegdev@gitmailbox.com>; Wed, 26 Mar 2025 08:54:10 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 12CE3687B90;
Wed, 26 Mar 2025 10:54:06 +0200 (EET)
Received: from mail-lf1-f50.google.com (mail-lf1-f50.google.com
[209.85.167.50])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D0DDC687ABD
for <ffmpeg-devel@ffmpeg.org>; Wed, 26 Mar 2025 10:53:58 +0200 (EET)
Received: by mail-lf1-f50.google.com with SMTP id
2adb3069b0e04-54991d85f99so705439e87.1
for <ffmpeg-devel@ffmpeg.org>; Wed, 26 Mar 2025 01:53:58 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=martin-st.20230601.gappssmtp.com; s=20230601; t=1742979238; x=1743584038;
darn=ffmpeg.org;
h=content-transfer-encoding:mime-version:message-id:date:subject:cc
:to:from:from:to:cc:subject:date:message-id:reply-to;
bh=dcomh/3HCfZCIjCum2HD+T6RXOcilldTpHa23qv8nuc=;
b=cHIkCEuz7HDIRgzbk3DEsQMYRrEIMz/lvJBQxCCT8rPZtxgcI2yZ6rYSyYv0WRN2AT
HaviTIa2empjn4EU2nJh4fTeG6eR7MIPAamkMU8OHvnkO4pweDF/OD40QYM/cCB/S4Qu
nKpE+ccdEottwTNTm2+xItyeSP7wzoQeWW1ZI4kC0ZHSuC1t5agHK37A0ZCd6tOgBgrz
dJr/yCm5toRUayhmDj1EOBBocu86EdlIEeQZvZ/3+tCLFeW1dI29yO28Wr9WmSO/iJ9/
ti2o8p8fS/TnTURV6+Bdnw5EKs4le9Q9yn8IrUHCWI57qLIRRz/ldwCu+s3MXRH26oe5
+bLg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1742979238; x=1743584038;
h=content-transfer-encoding:mime-version:message-id:date:subject:cc
:to:from:x-gm-message-state:from:to:cc:subject:date:message-id
:reply-to;
bh=dcomh/3HCfZCIjCum2HD+T6RXOcilldTpHa23qv8nuc=;
b=tRGRN+niSr/ixeTtR6hENpRLIZ3QebtiEaXfXZR8nEJC+5OoqlFyQx3ebIxNVTzrKf
+BqVK/62VbtTT9BNAMh2LnMc9yuKdVysaIjAORiEBnQG4mVzjzr1scJN/5Ea4OqOTBj5
iUAbV/cTIpZfgWw4hAHoi/BEzNi1gGxn6BF1yLKb/WNhsfdlD34CQvFvBwUpnhkKZJtF
TK5M4HFYf+znbHrVZ5k4cPP7IYIzijownyEDjBf0L8XLp947X2e+b9vWcSI6V8+QmB86
o+CHiH5UwKLIIgwmaLKQzSp7ekjrE7JDh8U4xlvFSwhQmMIiOFcZyy2h9gRZrqWzzgAA
phTQ==
X-Gm-Message-State: AOJu0YygAz83bZBBrevMY/ebm8JPTJRSEIwkcSYXvM73wmtZa4vzSmz+
kgiTr1H7qmKxcfNBHyb6V/orbbQSK0QrMMuTDrw04fWyq7MPB2Z4WcjWm8YGIlAQnZ3TryHiQ9R
jtA==
X-Gm-Gg: ASbGncs2VSoMaNK4O00prlqXtyEbpx5ksU5EAn6DTTANhiuc3qutUoLNcsVrkckKp2Y
9fMUnp5aJViRunyX6yMN250bVYVdq7o5DBIAupw2cZPVks5mJFiECJqA3QM6j97D701upx8BCs0
wyMc6MZgAVVZWZzL78nK7aQfC2Ya383qp5PfSDONjBzWKmJD+EFy+8joAAdNkLknButPNQgLPe4
LJU8WyBwVObQF59bef8spdnwv+MDVwKMwmK248pgwHy8aVmuTjiW9OyR1Oty1OKxD7/rV9DvbMC
UKaMMkcSScPNyL1+QvhgKmXtSwxRcsGSoOSz5WRqmGT6YBUZm0LlAbb4Dsn8nwfFnii2lGuOaqo
jUt8W12EH7kA=
X-Google-Smtp-Source: AGHT+IF38EBX11xEbIaG4v3wgingPABUxJNmc/R2yfu1j/KZv34IVgjWp1TQ9bWnz0gDKkbpjvtfxw==
X-Received: by 2002:a05:6512:2912:b0:549:965f:5960 with SMTP id
2adb3069b0e04-54afaca7ff1mr867734e87.16.1742979237465;
Wed, 26 Mar 2025 01:53:57 -0700 (PDT)
Received: from localhost (dsl-tkubng21-50de30-198.dhcp.inet.fi.
[80.222.48.198]) by smtp.gmail.com with ESMTPSA id
2adb3069b0e04-54ad651263dsm1706476e87.253.2025.03.26.01.53.56
(version=TLS1 cipher=AES128-SHA bits=128/128);
Wed, 26 Mar 2025 01:53:56 -0700 (PDT)
From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin@martin.st>
To: ffmpeg-devel@ffmpeg.org
Date: Wed, 26 Mar 2025 10:53:55 +0200
Message-Id: <20250326085355.42194-1-martin@martin.st>
X-Mailer: git-send-email 2.39.5 (Apple Git-154)
MIME-Version: 1.0
Subject: [FFmpeg-devel] [PATCH v2] videotoolbox: Fix building with older SDKs
X-BeenThere: ffmpeg-devel@ffmpeg.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: FFmpeg development discussions and patches <ffmpeg-devel.ffmpeg.org>
List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>,
<mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe>
List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel>
List-Post: <mailto:ffmpeg-devel@ffmpeg.org>
List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help>
List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>,
<mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe>
Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Cc: Zhao Zhili <quinkblack@foxmail.com>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: ffmpeg-devel-bounces@ffmpeg.org
Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org>
Archived-At: <https://master.gitmailbox.com/ffmpegdev/20250326085355.42194-1-martin@martin.st/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.com>
The kVTVideoDecoderReferenceMissingErr constant was only added
in the macOS 12 and iOS 15 SDKs. Use a hardcoded value instead
of the named constant, to fix building with older SDKs
after c6214b0d691566c7cb0f2ff5be08a24c3534e5bb.
---
libavcodec/videotoolbox.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/libavcodec/videotoolbox.c b/libavcodec/videotoolbox.c
index aaa6129576..a744657957 100644
--- a/libavcodec/videotoolbox.c
+++ b/libavcodec/videotoolbox.c
@@ -728,7 +728,8 @@ static void videotoolbox_decoder_callback(void *opaque,
}
if (!image_buffer) {
- if (status != kVTVideoDecoderReferenceMissingErr)
+ // kVTVideoDecoderReferenceMissingErr, defined since the macOS 12 SDKs
+ if (status != -17694)
vtctx->reconfig_needed = true;
av_log(vtctx->logctx, status ? AV_LOG_WARNING : AV_LOG_DEBUG,
--
2.39.5 (Apple Git-154)
_______________________________________________
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".