From patchwork Sun Feb 25 19:13:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Borsboom X-Patchwork-Id: 7748 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.181.170 with SMTP id m39csp1610916jaj; Mon, 26 Feb 2018 09:36:13 -0800 (PST) X-Google-Smtp-Source: AG47ELviSIVY9MQiFMq2zgIVljftodgVBKZBCUc8+mKlOQXN7bW6pPZsWwRW6RPOkUL6p/mpsHsn X-Received: by 10.28.69.214 with SMTP id l83mr8317798wmi.116.1519666573686; Mon, 26 Feb 2018 09:36:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519666573; cv=none; d=google.com; s=arc-20160816; b=SyB/Zb+HGHqL1DkPvOyybRfqkdmkf8PQnSCLh/ZOTvIxKn/Ym6wQX4OTZNUFmFuF0o 1j80lVDDqfo9xHRtkGJCVIJYtUIwMcXfI0MpAWm8xWn6qp1xcFCQUKwqnhQmTz27f4eB DRWbSxnJT66BBTTtBLu2rsr7ESBvOSB5NXEmCfcHeQZ4lNGctNy1orB+RgGbzl64V7+F Q50hcLFRL+xnTbp3DerFd0sBVjOLjiDLBiPsh4kkQEt/P0f92hG+AmeaFHPNY+FDcqFy pEFyDW9HdD4sKmCwlwCEr0oCtjzVWfFGguMlnHkSOysTiznHciXS/P2m/+nWVZugI7iK t+PA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:content-language:mime-version:user-agent:date :message-id:from:to:dkim-signature:delivered-to :arc-authentication-results; bh=U0wKCdgFeKBVztgjPnPcvYy+Mm/X/Dc+vXvPjNBTmG8=; b=Yuz9KritXflvD9P8FNFbUgWdMU4/Y7qryEPjF13QNAsXYn/sUcP/TBDYzxjJ0dQ8eb RQcbfw3mkL5paTIA41Xltwp/hBqLehKzuOaT7QIoQf1KFfaTEPks1ufNYjvSzf5D3iez fSxN5hOdyujC1yhrGxkXobZcN+rGRO99eWkk3rHXKtla1Syj5l0nZn+joHgYUqLfqVPA nNieAV9L93yXQcPm/ADEjyYpuKde4bra/DZI1hFMjcUIeu95P08qhtRgWukWRGWSemuI 9RnqpnvVv6hu971jnu5VuSxB/BDBjs77Nr/XTIfYDLUDU2uq7pgDj0zb7q5nhNjEn4LI uI5Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@carpalis.nl header.s=default header.b=UarZSnX5; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id e8si8564097wrc.177.2018.02.26.09.36.13; Mon, 26 Feb 2018 09:36:13 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@carpalis.nl header.s=default header.b=UarZSnX5; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2CD4768A391; Mon, 26 Feb 2018 19:35:54 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from kyoto.xs4all.nl (kyoto.xs4all.nl [83.161.153.34]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id ABB9B689CD0 for ; Sun, 25 Feb 2018 21:13:43 +0200 (EET) Received: from [IPv6:2001:980:9507:0:d6be:d9ff:fe47:dbd0] ([IPv6:2001:980:9507:0:d6be:d9ff:fe47:dbd0]) (authenticated bits=0) by kyoto.xs4all.nl (8.14.7/8.14.7) with ESMTP id w1PJDkLC021242 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sun, 25 Feb 2018 20:13:46 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=carpalis.nl; s=default; t=1519586026; bh=5B6uDrJfw21BqsS1s9I8SXEQsQVeTIQAV19KPM71jL4=; h=To:From:Subject:Date; b=UarZSnX5vAwXN83mq1xOvShdM+yU7qi8PEQHZf/QltC5GA1Oz6Y+pgNy/0srAWRr0 1eJSiTa04ja8MzPqyZNpJ+pVcpdLHuiCIqt+qr3swVyFDhtwcgsxLJxt/MYxsDlw8c XNwqJaBYgPjeYYKNPnO+RlPxGbQPfHQ93lcabtLj+snJN7xwjfK3maE+rLwnk2LUJB oo+NLT5/yYqudOx6Hnt0WoQgez8GSEwpfIuQT6KToG5YSZ6VDAYARIHYKBrRMi6b8v 7Q0knuL8KEzGu0Om4MbLa09gVAUPQNtaEVSTParTtu6EQBY9REQqnA/4Kl7TFAasNg Q/ye0UoTUetpw== To: ffmpeg-devel@ffmpeg.org From: Jerome Borsboom Message-ID: Date: Sun, 25 Feb 2018 20:13:46 +0100 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.6.0 MIME-Version: 1.0 Content-Language: nl X-Mailman-Approved-At: Mon, 26 Feb 2018 19:35:52 +0200 Subject: [FFmpeg-devel] [PATCH 3/3 v1.1] avcodec/vaapi: mask unused bits in bitplane_present.value X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" avcodec/vaapi: mask unused bits in bitplane_present.value Due to the union construct, unused bits in bitplane_present.value might be uninitialized even when the used bits are all set to a value. Masking the unused bits prevents spurious true values when all used bits are unset, e.g. skipped pictures. Signed-off-by: Jerome Borsboom --- libavcodec/vaapi_vc1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/vaapi_vc1.c b/libavcodec/vaapi_vc1.c index a137979dd4..e93b7285e3 100644 --- a/libavcodec/vaapi_vc1.c +++ b/libavcodec/vaapi_vc1.c @@ -387,7 +387,7 @@ static int vaapi_vc1_start_frame(AVCodecContext *avctx, av_unused const uint8_t if (err) goto fail; - if (pic_param.bitplane_present.value) { + if (pic_param.bitplane_present.value & 0x7f) { uint8_t *bitplane; const uint8_t *ff_bp[3]; int x, y, n;