[FFmpeg-devel] [PATCH] avutil/hwcontext_videotoolbox: fix unused variable warning

[Marvin Scholz]

On 27 Jun 2025, at 2:31, Marvin Scholz wrote:

> Resolves an unused variable warning when targeting a recent appleOS
> version.
> ---
>  libavutil/hwcontext_videotoolbox.c | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/libavutil/hwcontext_videotoolbox.c b/libavutil/hwcontext_videotoolbox.c
> index 172683121f..102fa485e5 100644
> --- a/libavutil/hwcontext_videotoolbox.c
> +++ b/libavutil/hwcontext_videotoolbox.c
> @@ -540,8 +540,6 @@ CFStringRef av_map_videotoolbox_color_trc_from_av(enum AVColorTransferCharacteri
>  static CFDictionaryRef vt_cv_buffer_copy_attachments(CVBufferRef buffer,
>                                                       CVAttachmentMode attachment_mode)
>  {
> -    CFDictionaryRef dict;
> -
>      // Check that our SDK is at least macOS 12 / iOS 15 / tvOS 15
>      #if (TARGET_OS_OSX  && defined(__MAC_12_0)    && __MAC_OS_X_VERSION_MAX_ALLOWED  >= __MAC_12_0)     || \
>          (TARGET_OS_IOS  && defined(__IPHONE_15_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_15_0)  || \
> @@ -558,7 +556,7 @@ static CFDictionaryRef vt_cv_buffer_copy_attachments(CVBufferRef buffer,
>          (TARGET_OS_IOS  && (!defined(__IPHONE_15_0) || __IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_15_0))  || \
>          (TARGET_OS_TV   && (!defined(__TVOS_15_0)   || __TV_OS_VERSION_MIN_REQUIRED     < __TVOS_15_0))
>          // Fallback on SDKs or runtime versions < macOS 12 / iOS 15 / tvOS 15
> -        dict = CVBufferGetAttachments(buffer, attachment_mode);
> +        CFDictionaryRef dict = CVBufferGetAttachments(buffer, attachment_mode);
>          return (dict) ? CFDictionaryCreateCopy(NULL, dict) : NULL;
>      #else
>          return NULL; // Impossible, just make the compiler happy
> -- 
> 2.39.5 (Apple Git-154)

If there are no objections, I plan to push this patchset this weekend.