From patchwork Fri Oct 1 21:08:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30868 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp2087919iob; Fri, 1 Oct 2021 14:09:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwUyxnhDTJ6jT/mYYYc1s45ym23qkIo6Jv4wCswubyN/bkRAkDj5rlbhJpqMxGcAUlebbnH X-Received: by 2002:a17:906:5051:: with SMTP id e17mr75793ejk.481.1633122555541; Fri, 01 Oct 2021 14:09:15 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id w13si9040530edd.112.2021.10.01.14.09.15; Fri, 01 Oct 2021 14:09:15 -0700 (PDT) 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=@outlook.com header.s=selector1 header.b=koxhek6v; arc=fail (body hash mismatch); 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0A2BE68A8C7; Sat, 2 Oct 2021 00:09:05 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-oln040092068011.outbound.protection.outlook.com [40.92.68.11]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id ABA4B68A6F6 for ; Sat, 2 Oct 2021 00:08:58 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jLMnX4qzH37VE0iwX8yCfpGZ1r439qWkK1H+Hm52P1Pvt1UaDwCb6t4zGSIhB5pcm5CQ4VapSZ6Tb5/nEsROY8BjbjWwXmP9VjQyCOGipLcmMYWaQJMgW5yAnWI07tzwT0MCPrCsMqr/7Mo8+dA/AmB/P0CShFXLERDMz1OVx9QvI5unBPQVlAh5ZQCp7aBxYaxZxeFSFGrMzNug8IIJKUGYLlpZFj10uqBJgAqZ8owiqno4JiQoFM8n0c6FJ6Cvxpc+UyrhuJoLsc1nPesob4GZB1bF8ul0M9hd4CYz3GLm2UOQmt806F3gg07hqgRUD0DG0Zv2xf55TPQdCqBcUA== 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=veZG++pB51fsdJyfyXigHAAIeRGD7kBccO8NDEXkJW8=; b=kHuQ1WZVdHNeHIS2lYXmyN4u3Lr8ueblNOA+qVg+JxylaVdZkNfQ0NCDd8jRGRmPpJ8/CeY5Z71m9CCUna3vtS5Nkkyp9xnUQivi7F0e5K6mmN3/WYJWfuLmi6TIUHVxZztv68OeqPwFzlMU9TmEJcmBdAo6ntxPBhKc2PeqIOQY9S0Mb2rCAbNXMt1Y79o1ckJnFoaPrvCdN2zpiEJRkIVxzjpq6hlP+BIqjOFjf3qIqo35PAzt/1ORJFjEKMbo7O4G5/XmWedThlmIu2L+sWOzSIrhevS02csf1WITHL1M5xXE+1oX6/xUAT5XuusR0BhCxgW0DNxqogWiLRfNHA== 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=veZG++pB51fsdJyfyXigHAAIeRGD7kBccO8NDEXkJW8=; b=koxhek6v1Q3H/Bqo2v0ZlW/oCriecRqx6nElpXRBN++3/0hneI9jDl9jqXgFG/yVJRw2Ld67aLHyoK8puXbmm8wAij11kv1wpGXsilgQ9aSpWlmmazfd1vQy8Uanq5kzjjRwzw/Dag5VQ8igRFs995ZWdy+7k50hnawRMFH9YxlnHGq70vTnNIqgGiyV70VZrVL0dGb5YhZq5FHZ524X/DYvdaIhkFE8RPSo6XFG7ukhbp+cn/rDx7qkOqGmql9KQKIbzEYjJh/tevxRVxGR//yQvcDdr++2x+CSwH6UGo836rrfuFXWaZIx9Hi4DWf1gatMr6d3E2zwoyAe9dUd5g== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AS8PR03MB6952.eurprd03.prod.outlook.com (2603:10a6:20b:29a::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.17; Fri, 1 Oct 2021 21:08:57 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51%7]) with mapi id 15.20.4566.019; Fri, 1 Oct 2021 21:08:57 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 1 Oct 2021 23:08:21 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [loJK26l3lvMWsZqQbrEDK2DfrBMwpxxB] X-ClientProxiedBy: FR3P281CA0071.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:4b::7) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211001210837.2879205-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by FR3P281CA0071.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:4b::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.8 via Frontend Transport; Fri, 1 Oct 2021 21:08:57 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0170bb56-f129-4751-363d-08d9851faee1 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiTgZdhvd8QKnLjC/Dfe6SG9xkgwbT+8VkHZNOozDUNiX+q+lQ0AKIEt0Vt8hk38aC+RL6Ua/30oZvpYBUDCwBASGc8pwnuEj4OuEKBAIYv6sy2+ngHX1igCaF9x7gehU1ZnFdH6tN+pS47SeefSD5UY0QzyxYnOAJ2ZiMQof7uf9XpJsjUnSyZ99qbsm74i12+9GrfhNRkPNsSbZHCfdLfdz3tzESSYr5RdH7t5k1LOPe1SmSH+ZsSX3fuwzsBRsjdx9wCQdoGTQLIniuy/w9x6BT4MFp4K9Pn5yPTBm3WedbtfWb/HTI7xzlJAZNgSxVkTpVUC+Vv7yInOqex2xEKGergbcO+cNv5dTI8gP53+s4VS8oe0I76Sq6VAJPrgbm1lLam9BYu2dLMsjpnQRE0VQkYiFE/odUjguVRXNaDnRNVWjEFOuRiJA67H2C9j7t9EVIdtc1ZJZGm3Ac7zF+qhIjorKyPoFAT4HY9u+iPH96zhDx5f5UsCf1hqqlQ5hVvo0elDnf8tGPmyBRoDG//9XvFFsDiI/1WStgkMO6YeNGICeo1TRYT02TXQSvYweF3UQhs51lgVLYy72y1YHV5/pWffo1SGRxO5ndiK4Mj5ATunkrbDwcs+XbpK+rkCUuyWQk/xIBfv4AaJPmnq5HJJoz/ZB0AA+l4AStrKVZ5PPV1BNomN3zMGaTtc0vgEoGRtPjRWP3vxxvl/6cZ208Rf2QpIWrHK5wZzsl7LaANafP6vuycVHp2iBtaoRjn4v1o= X-MS-TrafficTypeDiagnostic: AS8PR03MB6952: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 49AwIhhq1lFy8t+a/esXdBpy9BFSWWW1pWUiKpj3hEFXuIgNkSZ6Y6iG8z5n7dKagjYLvfi1jkQLW4opwtKhSiNFrWi+xk9k4p9zJeBpQyf2tbm2jjlHLwOjEi8BoQOh601DoCozrrSULh6+Ez2BhuSYs94zl9Z46+zFcb4hslayx20dhrG1QrujgAf05P8OGDzhX+wd4puA8oxcX94Cw8HatUoqZyhwRJHiuewx9moh1nD6pBgFpmwnD+LG1LeorgD5cyIzEITPrVr3INzmWk+gm800NaVQtiFBGqc9rm3XoZUFzb3nfR1HyckUs1h8Q7eo8+7xEQ46LDesF+J+t1uc/raFHr2QwOTS/g7tXLpiPicf3+tHHPYxR6idoWyhgsl17IY7d743bGrSJ5PI5tXw+z5ZGH4dHJ9WCmVlV1M9B0HPj5Ni62MQALROR8Ad X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 4NKs8oWHD32SUCI2AOkDtPibxYiGbCUyrbYEqi9yNljMeXUw0JpCbD6Jm949LXMALC46I7yrbsTS9FElORYFGqq8h3rnozpiZcYauPXi1XGAAEl9LtTfNO6MP3BYbj0zcPpTCYwDZD1XkdqiznN0jA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0170bb56-f129-4751-363d-08d9851faee1 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Oct 2021 21:08:57.5923 (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: AS8PR03MB6952 Subject: [FFmpeg-devel] [PATCH 04/20] avcodec/vc1_pred: Remove unused function parameter 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 0TIJ2JCFgd6t Signed-off-by: Andreas Rheinhardt --- libavcodec/vc1_block.c | 36 ++++++++++++++++++------------------ libavcodec/vc1_pred.c | 2 +- libavcodec/vc1_pred.h | 3 +-- 3 files changed, 20 insertions(+), 21 deletions(-) diff --git a/libavcodec/vc1_block.c b/libavcodec/vc1_block.c index b6ace37658..c922efe4c8 100644 --- a/libavcodec/vc1_block.c +++ b/libavcodec/vc1_block.c @@ -1642,7 +1642,7 @@ static int vc1_decode_p_mb_intfr(VC1Context *v) dmv_x = dmv_y = 0; if (mvbp & (8 >> i)) get_mvdata_interlaced(v, &dmv_x, &dmv_y, 0); - 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_pred_mv_intfr(v, i, dmv_x, dmv_y, 0, v->range_x, v->range_y, 0); ff_vc1_mc_4mv_luma(v, i, 0, 0); } ff_vc1_mc_4mv_chroma4(v, 0, 0, 0); @@ -1652,14 +1652,14 @@ static int vc1_decode_p_mb_intfr(VC1Context *v) if (mvbp & 2) { get_mvdata_interlaced(v, &dmv_x, &dmv_y, 0); } - 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_pred_mv_intfr(v, 0, dmv_x, dmv_y, 2, v->range_x, v->range_y, 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); } - 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_pred_mv_intfr(v, 2, dmv_x, dmv_y, 2, v->range_x, v->range_y, 0); ff_vc1_mc_4mv_luma(v, 2, 0, 0); ff_vc1_mc_4mv_luma(v, 3, 0, 0); ff_vc1_mc_4mv_chroma4(v, 0, 0, 0); @@ -1669,7 +1669,7 @@ static int vc1_decode_p_mb_intfr(VC1Context *v) if (mvbp) { get_mvdata_interlaced(v, &dmv_x, &dmv_y, 0); } - 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_pred_mv_intfr(v, 0, dmv_x, dmv_y, 1, v->range_x, v->range_y, 0); ff_vc1_mc_1mv(v, 0); } if (cbp) @@ -1711,7 +1711,7 @@ static int vc1_decode_p_mb_intfr(VC1Context *v) v->blk_mv_type[s->block_index[1]] = 0; v->blk_mv_type[s->block_index[2]] = 0; v->blk_mv_type[s->block_index[3]] = 0; - ff_vc1_pred_mv_intfr(v, 0, 0, 0, 1, v->range_x, v->range_y, v->mb_type[0], 0); + ff_vc1_pred_mv_intfr(v, 0, 0, 0, 1, v->range_x, v->range_y, 0); ff_vc1_mc_1mv(v, 0); v->fieldtx_plane[mb_pos] = 0; } @@ -2362,7 +2362,7 @@ static int vc1_decode_b_mb_intfr(VC1Context *v) if (val) get_mvdata_interlaced(v, &dmv_x, &dmv_y, 0); 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_pred_mv_intfr(v, j, dmv_x, dmv_y, 2, v->range_x, v->range_y, dir); ff_vc1_mc_4mv_luma(v, j, dir, dir); ff_vc1_mc_4mv_luma(v, j+1, dir, dir); } @@ -2375,14 +2375,14 @@ static int vc1_decode_b_mb_intfr(VC1Context *v) if (mvbp & 2) get_mvdata_interlaced(v, &dmv_x, &dmv_y, 0); - 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_pred_mv_intfr(v, 0, dmv_x, dmv_y, 1, v->range_x, v->range_y, 0); ff_vc1_mc_1mv(v, 0); dmv_x = dmv_y = 0; if (mvbp & 1) get_mvdata_interlaced(v, &dmv_x, &dmv_y, 0); - 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_pred_mv_intfr(v, 0, dmv_x, dmv_y, 1, v->range_x, v->range_y, 1); ff_vc1_interp_mc(v); } else if (twomv) { dir = bmvtype == BMV_TYPE_BACKWARD; @@ -2393,12 +2393,12 @@ static int vc1_decode_b_mb_intfr(VC1Context *v) dmv_x = dmv_y = 0; if (mvbp & 2) get_mvdata_interlaced(v, &dmv_x, &dmv_y, 0); - ff_vc1_pred_mv_intfr(v, 0, dmv_x, dmv_y, 2, v->range_x, v->range_y, v->mb_type[0], dir); + ff_vc1_pred_mv_intfr(v, 0, dmv_x, dmv_y, 2, v->range_x, v->range_y, dir); dmv_x = dmv_y = 0; if (mvbp & 1) get_mvdata_interlaced(v, &dmv_x, &dmv_y, 0); - ff_vc1_pred_mv_intfr(v, 2, dmv_x, dmv_y, 2, v->range_x, v->range_y, v->mb_type[0], dir2); + ff_vc1_pred_mv_intfr(v, 2, dmv_x, dmv_y, 2, v->range_x, v->range_y, dir2); if (mvsw) { for (i = 0; i < 2; i++) { @@ -2408,8 +2408,8 @@ static int vc1_decode_b_mb_intfr(VC1Context *v) s->mv[dir2][i+2][1] = s->mv[dir2][i][1] = s->current_picture.motion_val[dir2][s->block_index[i]][1] = s->current_picture.motion_val[dir2][s->block_index[i+2]][1]; } } else { - ff_vc1_pred_mv_intfr(v, 0, 0, 0, 2, v->range_x, v->range_y, v->mb_type[0], !dir); - ff_vc1_pred_mv_intfr(v, 2, 0, 0, 2, v->range_x, v->range_y, v->mb_type[0], !dir); + ff_vc1_pred_mv_intfr(v, 0, 0, 0, 2, v->range_x, v->range_y, !dir); + ff_vc1_pred_mv_intfr(v, 2, 0, 0, 2, v->range_x, v->range_y, !dir); } ff_vc1_mc_4mv_luma(v, 0, dir, 0); @@ -2425,12 +2425,12 @@ static int vc1_decode_b_mb_intfr(VC1Context *v) if (mvbp) get_mvdata_interlaced(v, &dmv_x, &dmv_y, 0); - ff_vc1_pred_mv_intfr(v, 0, dmv_x, dmv_y, 1, v->range_x, v->range_y, v->mb_type[0], dir); + ff_vc1_pred_mv_intfr(v, 0, dmv_x, dmv_y, 1, v->range_x, v->range_y, dir); v->blk_mv_type[s->block_index[0]] = 1; v->blk_mv_type[s->block_index[1]] = 1; v->blk_mv_type[s->block_index[2]] = 1; v->blk_mv_type[s->block_index[3]] = 1; - ff_vc1_pred_mv_intfr(v, 0, 0, 0, 2, v->range_x, v->range_y, 0, !dir); + ff_vc1_pred_mv_intfr(v, 0, 0, 0, 2, v->range_x, v->range_y, !dir); for (i = 0; i < 2; i++) { s->mv[!dir][i+2][0] = s->mv[!dir][i][0] = s->current_picture.motion_val[!dir][s->block_index[i+2]][0] = s->current_picture.motion_val[!dir][s->block_index[i]][0]; s->mv[!dir][i+2][1] = s->mv[!dir][i][1] = s->current_picture.motion_val[!dir][s->block_index[i+2]][1] = s->current_picture.motion_val[!dir][s->block_index[i]][1]; @@ -2480,11 +2480,11 @@ static int vc1_decode_b_mb_intfr(VC1Context *v) if (!direct) { if (bmvtype == BMV_TYPE_INTERPOLATED) { - ff_vc1_pred_mv_intfr(v, 0, 0, 0, 1, v->range_x, v->range_y, v->mb_type[0], 0); - ff_vc1_pred_mv_intfr(v, 0, 0, 0, 1, v->range_x, v->range_y, v->mb_type[0], 1); + ff_vc1_pred_mv_intfr(v, 0, 0, 0, 1, v->range_x, v->range_y, 0); + ff_vc1_pred_mv_intfr(v, 0, 0, 0, 1, v->range_x, v->range_y, 1); } else { dir = bmvtype == BMV_TYPE_BACKWARD; - ff_vc1_pred_mv_intfr(v, 0, 0, 0, 1, v->range_x, v->range_y, v->mb_type[0], dir); + ff_vc1_pred_mv_intfr(v, 0, 0, 0, 1, v->range_x, v->range_y, dir); if (mvsw) { int dir2 = dir; if (mvsw) @@ -2500,7 +2500,7 @@ static int vc1_decode_b_mb_intfr(VC1Context *v) v->blk_mv_type[s->block_index[1]] = 1; v->blk_mv_type[s->block_index[2]] = 1; v->blk_mv_type[s->block_index[3]] = 1; - ff_vc1_pred_mv_intfr(v, 0, 0, 0, 2, v->range_x, v->range_y, 0, !dir); + ff_vc1_pred_mv_intfr(v, 0, 0, 0, 2, v->range_x, v->range_y, !dir); for (i = 0; i < 2; i++) { s->mv[!dir][i+2][0] = s->mv[!dir][i][0] = s->current_picture.motion_val[!dir][s->block_index[i+2]][0] = s->current_picture.motion_val[!dir][s->block_index[i]][0]; s->mv[!dir][i+2][1] = s->mv[!dir][i][1] = s->current_picture.motion_val[!dir][s->block_index[i+2]][1] = s->current_picture.motion_val[!dir][s->block_index[i]][1]; diff --git a/libavcodec/vc1_pred.c b/libavcodec/vc1_pred.c index f70956e739..ad2caf6db2 100644 --- a/libavcodec/vc1_pred.c +++ b/libavcodec/vc1_pred.c @@ -468,7 +468,7 @@ void ff_vc1_pred_mv(VC1Context *v, int n, int dmv_x, int dmv_y, /** Predict and set motion vector for interlaced frame picture MBs */ void ff_vc1_pred_mv_intfr(VC1Context *v, int n, int dmv_x, int dmv_y, - int mvn, int r_x, int r_y, uint8_t* is_intra, int dir) + int mvn, int r_x, int r_y, int dir) { MpegEncContext *s = &v->s; int xy, wrap, off = 0; diff --git a/libavcodec/vc1_pred.h b/libavcodec/vc1_pred.h index 4d47f86696..ff894e0417 100644 --- a/libavcodec/vc1_pred.h +++ b/libavcodec/vc1_pred.h @@ -30,8 +30,7 @@ void ff_vc1_pred_mv(VC1Context *v, int n, int dmv_x, int dmv_y, int mv1, int r_x, int r_y, uint8_t* is_intra, int pred_flag, int dir); void ff_vc1_pred_mv_intfr(VC1Context *v, int n, int dmv_x, int dmv_y, - int mvn, int r_x, int r_y, uint8_t* is_intra, - int dir); + int mvn, int r_x, int r_y, int dir); void ff_vc1_pred_b_mv(VC1Context *v, int dmv_x[2], int dmv_y[2], int direct, int mvtype); void ff_vc1_pred_b_mv_intfi(VC1Context *v, int n, int *dmv_x, int *dmv_y,