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 8334749434 for ; Sun, 11 Feb 2024 07:35:08 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 02A8468CF61; Sun, 11 Feb 2024 09:35:06 +0200 (EET) Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01olkn2072.outbound.protection.outlook.com [40.92.66.72]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 32C3C68CAFA for ; Sun, 11 Feb 2024 09:34:59 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RGg+8jsir+YW3Rq4liRoVxw1C54qV0Dj2Td7Ttz4uaxHCV5gF0FZUv/4zL4i5Bn0DqMkxvofXE9Ba/tJOtF0qV+5d/tbO7ON42+C1KOYoIspdm4bjHw76TkMGAp9hI+OFJ38mowaw+U8G9qhWKbh9glZL9NRFRGO3sT4+aT0qdBg7yYl8ufagLIAsPMHgSTDZIt2ZF4Kur05qwlAUfZ2UffJwFC18lQYBbFXEdceT4K+nM8B6pJGtac+23aEDNc+tVWWrXLj1rV2QtqspVvGdhyEmy5hBgA3ESKUKSRh6DJqsd5sxKI/nKxudV432sAY+99whdpHPJsrRRaqoTdK8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=2Ky7Tlixzi7Zi6F2pg3Q7O4LSBwt9zQiVgK4JYE3W/k=; b=RqYMoStojX6t+LIJ7cBKdsRF4xeu6kG0+bTjIdhqAruiIawvse1xu9q9XzeiT84KX6ZLuihoTMYGruqsngkGwxp/+3jrbQXRkHqlxQ8PmOz4vYeLWWitoJxPn2Kvj/qFfz8Yvr8DSwgO5L5XDZzyt0rTUu5ZOKxl7meX98m04/PO8lFo/bx7xgbVRQO0z51vu8huBcTo5pdI+d4KiJFw/ovMo5UFS1NUetdp/4pOnRjyXtyYK43Cvjga/xF7ycLAO5nOLxkLgpjlq/tJQ6OHSVety5lV5j5VH6AqmRn/sYaeMn/Zabbz9ykmcsJ8jhO2vMW3CfRlix/9glKYPfbrHw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=2Ky7Tlixzi7Zi6F2pg3Q7O4LSBwt9zQiVgK4JYE3W/k=; b=aGzf+X4C7mbaHg++B/rwos9DGZaO5Yj2svaSLYP19qWJzOu1WJwSVI35UWGVTJ5xb2Ha4xzQI3l2IPZEjna2oq/bvpHRX8ARuQJtg9k2ANvsGA6DErRFGCWX3MVVuIBZjsUDJpXyhBPZrdxSMcBxh0PG88G4zYPnDMe6WD5NouBzbYJbWUs0guY0DjsVBzmvhDDjs3YoMiDGFEk5a58Pjzyw4wgUIsiN6CrdRd9tPGKSQU7Tk88ZdOJBPHYvtzMCj67QAanMyc9NrecncHlb7ex1CywnTFIMPaNBnYWA3hSOZl47GxvRybSdHmvD7Hl+A/qPv6vRfykV4j/hzgFqtw== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AM8P250MB0309.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:328::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7270.35; Sun, 11 Feb 2024 07:34:56 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d%5]) with mapi id 15.20.7270.033; Sun, 11 Feb 2024 07:34:56 +0000 Message-ID: Date: Sun, 11 Feb 2024 08:36:51 +0100 User-Agent: Mozilla Thunderbird To: ffmpeg-devel@ffmpeg.org References: <20240211-vc1dec-v1-1-b2547d89cc6b@gmail.com> Content-Language: en-US From: Andreas Rheinhardt In-Reply-To: <20240211-vc1dec-v1-1-b2547d89cc6b@gmail.com> X-TMN: [XIyXDLmVNJeBavG/HLV18q7WgboRX5QzaFauwNPYqRI=] X-ClientProxiedBy: ZR0P278CA0162.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::13) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <7fc6f339-8687-4572-925c-2d3794c3b9c6@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AM8P250MB0309:EE_ X-MS-Office365-Filtering-Correlation-Id: c680c496-e474-489f-4197-08dc2ad3f1eb X-MS-Exchange-SLBlob-MailProps: Cq7lScuPrnqwZHg0HfSFdg5yZGCZdmRttYy1oeEYihYQtA3l7dpX2UPEFGZA7Qj3Xqvb6FavX7Z/YPRsFIHjVn3KvkXIca+T8e4KR0iJdDSagyx6wEYPMg/YMJ9NKVn/oZW/I6DUPPonaRJMpqC7Ul/57JlTDqgSAqJUvtoYKv03FhKfnyExOm6lox6a/KLjwk/AovaxiQTQAJwUWZk0h0CeAe1DPoEK0maE6tYM2vnMr7Wk2NevLC29SO6xqnwbqREiaz4C+b+vMrNGJ6icKoyFcrmpzkxHnHXeaL409sJGdFNkNqBRu1ZLM1mLF/dKfNOZCvsPje8XYh1fA5C5cfygRnRPWlmFhirm4cEN/njn5LIvxFslaMcAKXQZRh7xGv1vulW8XkvLye4c+ZLD0r08NfJleHEOzp3bG3SErdogYhFzn4zUVMoH72LmIda6UFx22Vl6tiEVztuU6w5ugm2XLkYhJYGq/X71mpU7Tja3OJB91yXluE3+czDsJCTGWMQJg0QTKRjC6348Momsxa42EoEMAHy8QezFkIXev6fYivp9Qon0veTHq8cRYD65i5GovwmhH8BqAIGpH5wPZpKuddJXe5uY32SYUeW2H9X4ONSOLhObh3yCREs0RBWbcvdACcX8xjXlXLOC/OiBZd+d/HG0NNm0tcYkrTgJjvXf4aCsOQz6CTHID9K3c77YX5EFVabI9b5+EhzD8IB1I0xCkvZENZFfpdLLrTKSnllqcJJFPnI+7Q6visj4tND2xLX8hSCo0ms= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ie5/WLeJZFyZ1UgU8jheXhJDOw+h1rJdnZ2TCrXx83T+7dRfdSwQLwYVhZAQMgGkrxTbQeQJcEhlJ1FOAcf0EO9QpF7LtnKr4YHeKwIBprBybXDqKzFbuDPPFNO1goVmTgIubsBCHdTqV4A/G7s5X79B1xm7OhEUq16vacmUH5cZYul71kE5jJk/mPetZMxqT6q65R5bRegwTvyWzPcgM0fqDwhDSc1kyQusBSZnhTyOKesJoh21zndjUh5iCpfnTjB6r9BxRKhDEu3kAgehiXdpgBWHM8zoj7vrRoykx8G/9BHJxXzQp2Udks8/FyP3bHLn+/quAueF7r/QMg2WPkiu1EiBZQvPwTVue9Ctt7zK0fXuyqbAAf2WV7OX1TBi7Of7ehiPU8pah9dDnjIpX52rkJXiiNB4eK/wv7m2n2ljJXv63Q6rkaBD8GRmYdtCl3h/UrD5W2N1BiomXa1Zuhv0xueJsGRh0p6gC8CwkbZiL/WILT9E87HBlCUss0xdIoimMqPTkUznfuEvK6/UvZR8ceNAZMg94PBOJHskb+AXGiSfvb+GfjU7/JwCbnSS X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?ZWhGVlhYVmhZRXNydnpNUFFweDljcHRvNXNHWUk5cGxNalhrekgzQ1ZaRXox?= =?utf-8?B?b2VnMlVCcUJpTDRiY3VXdm41a2FtRFlpL3NMcXBCc0hsWjZjZHRRMDk5RG02?= =?utf-8?B?VjRhQWJrL0FiV1ZFQmJPM0NJKzl5ZEpQeU0wR3ppK2RkUVVabE9vaWsrd3Jx?= =?utf-8?B?MExjSndodHJWbk85MkpDellGRFRGOXQzME9jYkhza2xRYlY4a3BOYXlFTjBV?= =?utf-8?B?TmxCeVNKL015eWVqNjl5TDJNcXNrTmM1aUFOcXNXYnBtMlE4YmprTGtDc1R0?= =?utf-8?B?ZnhtUU1NUnRFU1RMQnZjajlMNWdjRzJWb1JDUkxiWmxRZ2hzZ2dKVEYzazdE?= =?utf-8?B?VTJaUFJteVJRK2RlNTNGU3lmZmZ3cVJpU2ZCNDUybW5mTHpXMVd2RXljK2pu?= =?utf-8?B?U0Qxb2NiRERDMFU1Y21JSlBVOStCNVRjSCtnMFVJNGh0UWgrL1pOZnFFNWUz?= =?utf-8?B?aFFoZERTazBPREMxTS9OaGkvdmhNR2tJMTZMQU4rbFBuM3dqRGVDY2xnZXRn?= =?utf-8?B?K292YWZLdUp1bmtsUDZMOVlxT1kwRy9LNm5lbWR0bFU3VWpXRm8rcGw3aXFQ?= =?utf-8?B?WnlXTHo2WnBhUEJSVEZBY0hKbXUvVlgxNDIrUUM2RWl5c0VGeVNJb1IwRHcx?= =?utf-8?B?ci9oazd4bWhNNzRRQlAyRGlsd0k4M2FUd0o3QVBKZkd0SjV2N29zM1dGclRF?= =?utf-8?B?TC9yNVBxREJFaFRPTjAyMHEraXdRa2FrNjFJQmU1YUZxUHRwZ1pQZXNEZ3Bx?= =?utf-8?B?Q3Z3Y0Znc0FBbzduNmg0RkpDRVJvVUlqKzg3bHJwdE5GTmdFTnRZWVZwNmQy?= =?utf-8?B?M04xclo3Z1NSbGRtSDJ2RCswWnJKaFdKM1NrQ0RvWU9EbkVWWmsvUE9yZy9r?= =?utf-8?B?Um9FaU51b3RYNndlSWIwTEtkLzNIc1BzZ3R3NWpLZFNhb3JvQ29ZM0tqK1d5?= =?utf-8?B?TmtSNFZoaWhDQzZyYnM1REdHN3g1cGs0OHJpMkhXNU91QzZQTFBLVkptL2xR?= =?utf-8?B?S09OcnFnNksva3lKMG9BSU9lTDVTaG1JV1NFK1FMVjFRZDE5dG1yZE0weXVw?= =?utf-8?B?UmIrSUtabVI0RVN0Mk1mVDlkdldMOWFld0h0c2tGZGpnS1RCWUJhSWpCMjND?= =?utf-8?B?YmtFR2YrNS90UXg2NFFsMTJCazdPUWEvR2dtRFVSai9UcnAwbjgvNjVmYjY5?= =?utf-8?B?LzBLK2cwS3hnTUd6dG9UVFdMckNXWFQraXZabm4vTVp0Sjc2WnlEZlRUejNW?= =?utf-8?B?Zmc3Z3hoRStXQzU1cmFXQ091RnA4dlM3M2poVEhsQnJFZS8wVHRjTHRiWGN5?= =?utf-8?B?WTVCbGdCbnZRbkNMbkJRdEFDRUtJRmdzcEdtNlJBTUdneWF2SmFRRzRLajZS?= =?utf-8?B?ajJPb2F0cUFFWWNQQ3FzNGorSXo3Z0lSSGI3anFqOWR4Mk9lekJzZS83U1A3?= =?utf-8?B?K1hDVXFnTWpyYk1MTWFNRWJwVE1JWk50aUtzeEZ2UU00VXFYNDZITmdLdnd0?= =?utf-8?B?UVMveFdFQ2piQ2VvendxMElCamRFbExwQ3BFRGVlU0hKOE00WVFWQlFaNzRm?= =?utf-8?B?dzVBNC9YT0MvV3cycGU0MTg0eUU5amJwR2JTZ3BYYStIdmtvdGZ6c3ZEZXpu?= =?utf-8?B?UUNiajRweTY4c013bnI1QmdoVzFDLzQyZ2FxZVVST0FQRHBndTFIUHBxcm4y?= =?utf-8?B?UzhYRTcvOXRMZkp2aDdGMEJRc2YvVUZrbkdsRVI5ZklSQTVwSFI1TFZ3PT0=?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c680c496-e474-489f-4197-08dc2ad3f1eb X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Feb 2024 07:34:56.6553 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8P250MB0309 Subject: Re: [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 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: Akihiko Odaki: > 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, LGTM. Sorry for that, I didn't realize that this block was #if'ed. Will apply. - Andreas _______________________________________________ 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".