From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id F18E949431 for ; Sun, 11 Feb 2024 07:29:09 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2CBE968CEB3; Sun, 11 Feb 2024 09:29:06 +0200 (EET) Received: from mail-pg1-f174.google.com (mail-pg1-f174.google.com [209.85.215.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EA03068C180 for ; Sun, 11 Feb 2024 09:28:59 +0200 (EET) Received: by mail-pg1-f174.google.com with SMTP id 41be03b00d2f7-5cddfe0cb64so1518492a12.0 for ; Sat, 10 Feb 2024 23:28:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1707636537; x=1708241337; darn=ffmpeg.org; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:from:to:cc:subject:date:message-id:reply-to; bh=XczVAL1vERU5zM4xbcpv0fu6nGu7aqDGR/Ab3ykdCF0=; b=eqNQjDXoBkDWj6mTnZ7WIXY2iHiGKY9crjPAkitz9RJGSsAbn85DG2DJaAYgEfsPq7 0XCA/lttWSIj2s4J2ECFJGqb0kjwFBaLjV3nQH/nLYJihDGLXgSwXCGVd8v4025HIOWX H30RrVEBgnpbfTC0QD6gC5LxFP4pe5U+Id3d81rmD83Ldf6TdR6azbRhEd6shIyoFLM2 gLS++/BqTXfgaLAFykycbnAIAnLkkVo8sAde3yc8y63pYaDvQwa4UGBkpmEuqlrzrZlj 94sRiq8OmOcTU4sWHFmq26WWe49v7sUMiDm1qmNy/rToz1xSM43ntVVliVDmS96nFKsv MFbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707636537; x=1708241337; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=XczVAL1vERU5zM4xbcpv0fu6nGu7aqDGR/Ab3ykdCF0=; b=RsOrKHQ1Zad5eSRG6j870OR9mIZLHq4y61mwrTMBZzrLTb9vhNdm02HHI0SFaofEHH DRWCEeSWjuFgCZrnC/vFNyfSC71nO9LkyIbdGofb+vTidsBJhEoD5tdFVeX1U2GaWHo6 S3/y9cPkv+4zvpmQ12TcgGbvKTXDTsOajDl2or8C67A7VhdMnE2EdNYMXYPwUfi5fcCR 6eeEzX8JZ9wVoS4euv/yxN9mc3Q4TmuUZxnvqCZqFoqgZLoAqJYxOlrRRMWuHJIqXeFp YFUgkS6q4weYcEd2sZkNFVEq13QpEo7MY43UAmoXAWKQ6eMMNpetU8v88ZGAaX5a8T+A YGUA== X-Gm-Message-State: AOJu0Yw9nKu6dD/Q6FCmNu5N0Bg0x8hTrvY3K4StYkIDg+sbK10IksSy oTPFybly6GEE0Z3WNNmGD5QxmvaFOiqzkn+Ca9KrQfmUQhYFOKaY X-Google-Smtp-Source: AGHT+IG/q/yB1BsS5kAoGwE7vQeDYuIRp5HPw8QtN/CKmFNpLa31SGYx5wbTBQVs5+tzHAuHpDWfhw== X-Received: by 2002:a05:6a00:2387:b0:6e0:6bc7:15ec with SMTP id f7-20020a056a00238700b006e06bc715ecmr3655241pfc.30.1707636537487; Sat, 10 Feb 2024 23:28:57 -0800 (PST) Received: from localhost ([157.82.200.138]) by smtp.gmail.com with UTF8SMTPSA id s25-20020a62e719000000b006dde0969ce3sm3303385pfh.66.2024.02.10.23.28.56 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 10 Feb 2024 23:28:57 -0800 (PST) From: Akihiko Odaki Date: Sun, 11 Feb 2024 16:28:55 +0900 MIME-Version: 1.0 Message-Id: <20240211-vc1dec-v1-1-b2547d89cc6b@gmail.com> X-B4-Tracking: v=1; b=H4sIADZ3yGUC/6tWKk4tykwtVrJSqFYqSi3LLM7MzwNyDHUUlJIzE vPSU3UzU4B8JSMDIxMDI0MD3bJkw5TUZN2UZLMU8yRjwzRzS1MloOKCotS0zAqwQdGxtbUARW7 DjlgAAAA= To: ffmpeg-devel@ffmpeg.org X-Mailer: b4 0.12.3 Subject: [FFmpeg-devel] [PATCH] avcodec/vc1dec: Fix vc1_hwaccel_pixfmt_list_420 X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Akihiko Odaki Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: vc1_hwaccel_pixfmt_list_420 is referenced even if !(CONFIG_WMV3IMAGE_DECODER || CONFIG_VC1IMAGE_DECODER) so move it out of the #if block. Signed-off-by: Akihiko Odaki --- libavcodec/vc1dec.c | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index e71b92eef8..3ca478e82a 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -51,27 +51,6 @@ #include "libavutil/thread.h" -#if CONFIG_WMV3IMAGE_DECODER || CONFIG_VC1IMAGE_DECODER - -typedef struct SpriteData { - /** - * Transform coefficients for both sprites in 16.16 fixed point format, - * in the order they appear in the bitstream: - * x scale - * rotation 1 (unused) - * x offset - * rotation 2 (unused) - * y scale - * y offset - * alpha - */ - int coefs[2][7]; - - int effect_type, effect_flag; - int effect_pcount1, effect_pcount2; ///< amount of effect parameters stored in effect_params - int effect_params1[15], effect_params2[10]; ///< effect parameters in 16.16 fixed point format -} SpriteData; - static const enum AVPixelFormat vc1_hwaccel_pixfmt_list_420[] = { #if CONFIG_VC1_DXVA2_HWACCEL AV_PIX_FMT_DXVA2_VLD, @@ -96,6 +75,27 @@ static const enum AVPixelFormat vc1_hwaccel_pixfmt_list_420[] = { AV_PIX_FMT_NONE }; +#if CONFIG_WMV3IMAGE_DECODER || CONFIG_VC1IMAGE_DECODER + +typedef struct SpriteData { + /** + * Transform coefficients for both sprites in 16.16 fixed point format, + * in the order they appear in the bitstream: + * x scale + * rotation 1 (unused) + * x offset + * rotation 2 (unused) + * y scale + * y offset + * alpha + */ + int coefs[2][7]; + + int effect_type, effect_flag; + int effect_pcount1, effect_pcount2; ///< amount of effect parameters stored in effect_params + int effect_params1[15], effect_params2[10]; ///< effect parameters in 16.16 fixed point format +} SpriteData; + static inline int get_fp_val(GetBitContext* gb) { return (get_bits_long(gb, 30) - (1 << 29)) << 1; --- base-commit: 81c2557691b12ceb79b3ba92aa496f2301ab4d18 change-id: 20240210-vc1dec-dc6d7b31f795 Best regards, -- Akihiko Odaki _______________________________________________ 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".