From patchwork Fri Nov 20 07:32:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 23803 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id B54AD44A644 for ; Fri, 20 Nov 2020 09:33:42 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A0CF068BAEC; Fri, 20 Nov 2020 09:33:42 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f67.google.com (mail-ej1-f67.google.com [209.85.218.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AE34568BAEB for ; Fri, 20 Nov 2020 09:33:41 +0200 (EET) Received: by mail-ej1-f67.google.com with SMTP id o9so11565744ejg.1 for ; Thu, 19 Nov 2020 23:33:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references:reply-to :mime-version:content-transfer-encoding; bh=kCPJaBE6TMauY1J0BpG2lyY+d1Ppq9opJKWrP9ItLZQ=; b=QNCElfiyesW1Zkep+0XtANPaj+9hf8h0fVL3n7AVludTN0WA9ezNtxtcLaa8QhDUyH 8i8UQ5NgzNdu6L2GjTmXaok1fBNWJNEXqXDKTMmH2byvXeJrOXmc8XPKUWse+fv6tMZL xYlVMNRBNGWZOqZdp0JqKaprna07s4k3EBoKRqTw7i1Yce4/OJms7/lEimwDD+9dwTBb tSbGQ2ifv7s5rPncMqN2mJNVk0CoMDu9Tt43G21P1d54PcJkCW6xkrwuC31oHYkeyKil DGW4mwICA421m+XERpt1iBEooJBGx1krwRbkWEERDe9QmqXUa/FcSemqYT8J0CaWezHl OzNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:reply-to:mime-version:content-transfer-encoding; bh=kCPJaBE6TMauY1J0BpG2lyY+d1Ppq9opJKWrP9ItLZQ=; b=mtEKuH0bu2GJKiolq/H+SIr6EDBZTnyRiqXYDSafNo+8COe5zhwAYapfnk6KT4jq17 e3mT4etDuQ52RfLUAYC+bIIi3dgm4Ume9yrfIwHEFo9zHTv72FyLvMs13rGZOatZUX98 e1TULEVVN6SHgxwZ03O0NCUE7PQxy0WNnjksOnnIKMX3gHzU/Q9UAYiQFIvr9FcHWefQ K8iw9cXDhCGelkRYJYGInShbZHuuMmdnV2AMUT+gBW5pDZpC0GwovbgYSRTIytp1uax3 og3hJTfx+jj/b9McDRXLNFpJ3k+q8pKMI2ELldaCFNaWsrd4uk7nupOwZqi6o3R/1Qms RL8g== X-Gm-Message-State: AOAM5320Kz3l1llpQCFGPGBptUBvwnEPikbFCG37DYje5gecmFXWtbkA 03sX5qoU8TQe0JO18gvqz/uSs3TXVeBi7w== X-Google-Smtp-Source: ABdhPJwZ+Nyi9eWX2d2/jWUaB+hRuUtEVmGaU9/TO/7ZQ2HaVxajhZRatMzGqJHeqkfXcfiVOen0MQ== X-Received: by 2002:a17:906:77c5:: with SMTP id m5mr32234568ejn.424.1605857620946; Thu, 19 Nov 2020 23:33:40 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id i13sm769110ejv.84.2020.11.19.23.33.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Nov 2020 23:33:40 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 20 Nov 2020 08:32:25 +0100 Message-Id: <20201120073327.820745-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201120072116.818090-1-andreas.rheinhardt@gmail.com> References: <20201120072116.818090-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 100/162] avcodec/vc1_block: Don't use 0 for NULL 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Andreas Rheinhardt --- libavcodec/vc1_block.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/libavcodec/vc1_block.c b/libavcodec/vc1_block.c index 714b3cdea0..3c9d1d4b8d 100644 --- a/libavcodec/vc1_block.c +++ b/libavcodec/vc1_block.c @@ -1633,7 +1633,7 @@ static int vc1_decode_p_mb_intfr(VC1Context *v) for (i = 0; i < 4; i++) { dmv_x = dmv_y = 0; if (mvbp & (8 >> i)) - get_mvdata_interlaced(v, &dmv_x, &dmv_y, 0); + get_mvdata_interlaced(v, &dmv_x, &dmv_y, NULL); ff_vc1_pred_mv_intfr(v, i, dmv_x, dmv_y, 0, v->range_x, v->range_y, v->mb_type[0], 0); ff_vc1_mc_4mv_luma(v, i, 0, 0); } @@ -1642,14 +1642,14 @@ static int vc1_decode_p_mb_intfr(VC1Context *v) mvbp = v->twomvbp; dmv_x = dmv_y = 0; if (mvbp & 2) { - get_mvdata_interlaced(v, &dmv_x, &dmv_y, 0); + get_mvdata_interlaced(v, &dmv_x, &dmv_y, NULL); } ff_vc1_pred_mv_intfr(v, 0, dmv_x, dmv_y, 2, v->range_x, v->range_y, v->mb_type[0], 0); ff_vc1_mc_4mv_luma(v, 0, 0, 0); ff_vc1_mc_4mv_luma(v, 1, 0, 0); dmv_x = dmv_y = 0; if (mvbp & 1) { - get_mvdata_interlaced(v, &dmv_x, &dmv_y, 0); + get_mvdata_interlaced(v, &dmv_x, &dmv_y, NULL); } ff_vc1_pred_mv_intfr(v, 2, dmv_x, dmv_y, 2, v->range_x, v->range_y, v->mb_type[0], 0); ff_vc1_mc_4mv_luma(v, 2, 0, 0); @@ -1659,7 +1659,7 @@ static int vc1_decode_p_mb_intfr(VC1Context *v) mvbp = ff_vc1_mbmode_intfrp[v->fourmvswitch][idx_mbmode][2]; dmv_x = dmv_y = 0; if (mvbp) { - get_mvdata_interlaced(v, &dmv_x, &dmv_y, 0); + get_mvdata_interlaced(v, &dmv_x, &dmv_y, NULL); } ff_vc1_pred_mv_intfr(v, 0, dmv_x, dmv_y, 1, v->range_x, v->range_y, v->mb_type[0], 0); ff_vc1_mc_1mv(v, 0); @@ -2352,7 +2352,7 @@ static int vc1_decode_b_mb_intfr(VC1Context *v) dmv_x = dmv_y = 0; val = ((mvbp >> (3 - i)) & 1); if (val) - get_mvdata_interlaced(v, &dmv_x, &dmv_y, 0); + get_mvdata_interlaced(v, &dmv_x, &dmv_y, NULL); j = i > 1 ? 2 : 0; ff_vc1_pred_mv_intfr(v, j, dmv_x, dmv_y, 2, v->range_x, v->range_y, v->mb_type[0], dir); ff_vc1_mc_4mv_luma(v, j, dir, dir); @@ -2365,14 +2365,14 @@ static int vc1_decode_b_mb_intfr(VC1Context *v) mvbp = v->twomvbp; dmv_x = dmv_y = 0; if (mvbp & 2) - get_mvdata_interlaced(v, &dmv_x, &dmv_y, 0); + get_mvdata_interlaced(v, &dmv_x, &dmv_y, NULL); ff_vc1_pred_mv_intfr(v, 0, dmv_x, dmv_y, 1, v->range_x, v->range_y, v->mb_type[0], 0); ff_vc1_mc_1mv(v, 0); dmv_x = dmv_y = 0; if (mvbp & 1) - get_mvdata_interlaced(v, &dmv_x, &dmv_y, 0); + get_mvdata_interlaced(v, &dmv_x, &dmv_y, NULL); ff_vc1_pred_mv_intfr(v, 0, dmv_x, dmv_y, 1, v->range_x, v->range_y, v->mb_type[0], 1); ff_vc1_interp_mc(v); @@ -2384,12 +2384,12 @@ static int vc1_decode_b_mb_intfr(VC1Context *v) mvbp = v->twomvbp; dmv_x = dmv_y = 0; if (mvbp & 2) - get_mvdata_interlaced(v, &dmv_x, &dmv_y, 0); + get_mvdata_interlaced(v, &dmv_x, &dmv_y, NULL); ff_vc1_pred_mv_intfr(v, 0, dmv_x, dmv_y, 2, v->range_x, v->range_y, v->mb_type[0], dir); dmv_x = dmv_y = 0; if (mvbp & 1) - get_mvdata_interlaced(v, &dmv_x, &dmv_y, 0); + get_mvdata_interlaced(v, &dmv_x, &dmv_y, NULL); ff_vc1_pred_mv_intfr(v, 2, dmv_x, dmv_y, 2, v->range_x, v->range_y, v->mb_type[0], dir2); if (mvsw) { @@ -2415,7 +2415,7 @@ static int vc1_decode_b_mb_intfr(VC1Context *v) mvbp = ff_vc1_mbmode_intfrp[0][idx_mbmode][2]; dmv_x = dmv_y = 0; if (mvbp) - get_mvdata_interlaced(v, &dmv_x, &dmv_y, 0); + get_mvdata_interlaced(v, &dmv_x, &dmv_y, NULL); ff_vc1_pred_mv_intfr(v, 0, dmv_x, dmv_y, 1, v->range_x, v->range_y, v->mb_type[0], dir); v->blk_mv_type[s->block_index[0]] = 1;