From patchwork Fri Sep 4 19:49:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 22101 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 E352E44B48C for ; Fri, 4 Sep 2020 22:49:21 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C014568AC31; Fri, 4 Sep 2020 22:49:21 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 497026805A5 for ; Fri, 4 Sep 2020 22:49:15 +0300 (EEST) Received: by mail-wm1-f42.google.com with SMTP id u18so7457494wmc.3 for ; Fri, 04 Sep 2020 12:49:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Ucy12NvAYepqusBj2YsGogvjcyhaoLVOoPyskouivYo=; b=m6jEmACa4onhe596iaET7Yolyg/hcmLPYAaSXxwgpgJQsLaLN04xbF5rq/vK3vLTp0 qX8pgGNkZFK4OwVZBUt0m7ZHhzPGlyTQXrTEw9TJAwDmo7lELPRgsibZQb4BG7Dt4QKz R8bumT34TbwCsDHbrO63xLlUAH6lh8X60cUadqieot/kz17zlS5HqK38Ev3V1NZMHlQY DPFp3GQ6D78C3VPpDkHJYozxXdpHTltyfjjNkoheQxjKz787feoyt8x0zgdFlDJvaTx6 oCfyvujhrh+o7OkKCH33dFF/yPFGaOv7I0aAOLYEpKn+P2ySJb590WZED694NZxLagja +ZFA== 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:mime-version :content-transfer-encoding; bh=Ucy12NvAYepqusBj2YsGogvjcyhaoLVOoPyskouivYo=; b=QHZ6Ko/GA4KxZDuO/yrZrxhUc36g/h0xT/RYiDI/SfFMr+9Yhu2LcBJ07PMZBUS2L+ Prep6+UUtxQpXa0JRal0YLV9JDHQ8JA5IPhW7urodDheiIaw7sFSjNFk6oypYZ/w3Uyo fjD0R20q4WO6dZ3aug0TfMrzO6HcR7M99MdS4g7/u9oc5sFJPuPMb/TPz5lL8Kz+TTqc co65wlz5VppM8ml6wXe59maye5YGPJcFNBm8mPuQd+Ue89vmwXXckstbxEA5eJ96O3gd 8a6RgBn/tZIK/61y7/2f6yexA84TZQngHt1EInmI/TS2h5Jr8Mg/LHUMv9j+crwp5xFn BLlQ== X-Gm-Message-State: AOAM530SdOH1ZAmOd5bJzekRo1Xj0iDwQ2aKX5qNBAQ/Te0L58pNUxQf JFh/pHmF8h9qi40HRmu2vjBY9ZN1aC4= X-Google-Smtp-Source: ABdhPJy9esnPf/u79SXKUMO8UNfBpW/RFTqKQnP5iK1lX2xI9ePceQ6uQiH/UyfmkIBf3lXVaghUpg== X-Received: by 2002:a1c:4b04:: with SMTP id y4mr8988700wma.111.1599248954359; Fri, 04 Sep 2020 12:49:14 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1fb0f.dynamic.kabel-deutschland.de. [188.193.251.15]) by smtp.gmail.com with ESMTPSA id h184sm13703927wmh.41.2020.09.04.12.49.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Sep 2020 12:49:13 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 4 Sep 2020 21:49:04 +0200 Message-Id: <20200904194905.6269-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/mobiclip: Fix mixed declarations and code 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/mobiclip.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavcodec/mobiclip.c b/libavcodec/mobiclip.c index e2bda76978..d147eddbae 100644 --- a/libavcodec/mobiclip.c +++ b/libavcodec/mobiclip.c @@ -1333,13 +1333,15 @@ static int mobiclip_decode(AVCodecContext *avctx, void *data, setup_qtables(avctx, s->quantizer + get_se_golomb(gb)); for (int y = 0; y < avctx->height; y += 16) { for (int x = 0; x < avctx->width; x += 16) { + int idx; + motion[0].x = mid_pred(motion[x / 16 + 1].x, motion[x / 16 + 2].x, motion[x / 16 + 3].x); motion[0].y = mid_pred(motion[x / 16 + 1].y, motion[x / 16 + 2].y, motion[x / 16 + 3].y); motion[x / 16 + 2].x = 0; motion[x / 16 + 2].y = 0; - int idx = get_vlc2(gb, s->mv_vlc[s->moflex][0].table, - s->mv_vlc[s->moflex][0].bits, 1); + idx = get_vlc2(gb, s->mv_vlc[s->moflex][0].table, + s->mv_vlc[s->moflex][0].bits, 1); if (idx < 0) return AVERROR_INVALIDDATA;