From patchwork Sun Feb 25 13:23:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Borsboom X-Patchwork-Id: 7734 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.181.170 with SMTP id m39csp565436jaj; Sun, 25 Feb 2018 10:08:11 -0800 (PST) X-Google-Smtp-Source: AG47ELuGqqNGEiemzztHO0BHkysiLzdmizTAHXNdxoay0GEPaC1ZsfvbnDxyiAHrMhZCfrawYEVb X-Received: by 10.28.122.12 with SMTP id v12mr5960324wmc.66.1519582091226; Sun, 25 Feb 2018 10:08:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519582091; cv=none; d=google.com; s=arc-20160816; b=bh+Qa8hqD+02l7BUE3Q/hlGO2wqJBMU4agHCLXeABeA0P8+gFXgkTn9MfZ0+LWTTZO H9W9sQPzoyuLlEFsYq5E4x324kOC2qE44GZ/C4wIBa/jJznb+XtnhKw9DOGXXUXE4DXN snEiR2qf5gBo6uy2DJOzTgEGo2RGG0ShYyqSODIgx0z6FKHYhAAAwXFg36WRKdNpkLpx GRaB0XdnpXQm6CdBoB7Tkrm2jwrcrtsqf4mtyHT310l8OKo0oxOQGfr6+cY41lT/Y2E7 sfF5Ose6D5n4PU/i32JxMjLx3V6di2OjESL0woJI+o7PRj7t8nb48KAuHiJz+rOWAgLk DMAg== 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:to:from:dkim-signature:delivered-to :arc-authentication-results; bh=mJnwufx2HO1n3HLr+pPWyGHqOmJIzMWmm91+nHIuGGY=; b=m80OA+alwlA5EQXnQGtyQo9g30B6+Jhk6IRjn6CauT+TrTy8fGfW2obMJj5jvs7Vl3 gPH8HKNpwR4Ilynu9W/A9UKChOSLEGKF3MyNHkgH2BmcTdxTaBEjsSjwK3uzkjjbzBgP 8jxbbNM3SkfBmmM/UCWLkX81/6rLs0s8e2P6HSrEuL/GB/Gmzx/mmjFXKG3WGndReCKE hetgU/3hENEQz8MaiUX7OUD2hZ6VuoCaXibecyC9gIrIa12uMfEjoNWEQPvR4Zy06Mvr aypGGA0wgdQoxcRnIOSZ6uvQT4hvMjllpYEJvABQzwnhAg1i8YUaidfDqy4H0WQd389H cKSg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@carpalis.nl header.s=default header.b=m2h5x5pA; 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 e18si6321635wrc.149.2018.02.25.10.08.10; Sun, 25 Feb 2018 10:08:11 -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=m2h5x5pA; 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 55D6168A20E; Sun, 25 Feb 2018 20:07:59 +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 9A6BD689F8A for ; Sun, 25 Feb 2018 15:23:47 +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 w1PDNoOv017707 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Sun, 25 Feb 2018 14:23:50 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=carpalis.nl; s=default; t=1519565030; bh=lkKw8dV9Zixhjf9UdLqvFaSUW9rKY321nArjDpsPnQo=; h=From:Subject:To:Date; b=m2h5x5pAmwigTN7S5RGkldnBWMmhmVHpa821XHi3XexnW4NnxLviTM8poJC52Qevr FEz+fAPZQ0Z5SIedm0l6QfHbqs/zfTbU5R1ElGRA8lkpZldWnJgvr6ckvhsaMk03Pj RZBkPJJ9td7LOAiyQMFdlt3dyTFql9wUD49kD118DIOia/11TgtDhT8BRTz4nL/0/H t5tExad96ciTI2w6L6vp0/RzpWSQF56G4A9+iQnakZOWW6ZuD+Qz8sMnsdgYgXz25h QI9EdxhsrAKAs8qr7S9G10H+zoFlSiRD2szVlKFkACXsbrKnYzprlizTw7Piuv1ZGw 8IlX3/N6a82vQ== From: Jerome Borsboom To: ffmpeg-devel@ffmpeg.org Message-ID: <727ea44a-88ab-34ae-5881-c1e5afa47e58@carpalis.nl> Date: Sun, 25 Feb 2018 14:23:50 +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: Sun, 25 Feb 2018 20:07:58 +0200 Subject: [FFmpeg-devel] [PATCH 3/3] 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" 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;