From patchwork Tue Sep 15 07:39:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 22389 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 329B844B636 for ; Tue, 15 Sep 2020 10:40:42 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1EA0268BC23; Tue, 15 Sep 2020 10:40:42 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8C95768B85A for ; Tue, 15 Sep 2020 10:40:38 +0300 (EEST) Received: by mail-wr1-f46.google.com with SMTP id w5so2149724wrp.8 for ; Tue, 15 Sep 2020 00:40:38 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=RKh1fzfoSo6fCgF6mn9T/kDIKRYFidE4vPLsvvkaIQc=; b=gIYRnjDI1oplYtvQ4bGwPtZSuDnkMVkN2+bWdDfcKvgO2pSDLnnxEAwZIiJHznQRzw 5zwr4zFREB47k8qzqy/is5xp/n4H173HT+sqlDN0sTFEsEnU+vv19vb4UfJA2uHpzuKx qzB+SmIpAM8cNvPUkWUm1GasQtze7WtJM6y4cdK84gs2JismDHtkXpVnBMLwRyJ7XGzb cwp8Q6hCJmMuouI58DkDr5EbEyBwuXYqVif2bTJtFmZEE5Ub8IbTquOMAKz0vgMDRskG +WngwkDJkFggCIqoiBVfLgJgr3m0MBE4Im4pqOTVu77aTlDYXefYwxz/yx/oGj0bBzAH vAdw== 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:mime-version:content-transfer-encoding; bh=RKh1fzfoSo6fCgF6mn9T/kDIKRYFidE4vPLsvvkaIQc=; b=epnFtUrwPDvdFhRfOfMuEhdpOdaNv36eEKovnAbqjCY4wId+REt08zi6oHyKVqNxcv 0VT8YpQdTnDPdxeEbPEcc0o1Yz3+pefnpbcngm6ZhiEENlWY+Q6ocvdtQGT7osho1qH9 EUHK1InrnLnQP2QG3dZRgZwh/hfEyBg51qZQ87BWJisoqsqgKiFRXhgWyvkKK6Sy+slZ lMAW/Ox9YVNOR8UHqivLTlgTCLVTVOOjsWLc2BKTwB2D+/CYHxCWkI9b7PcqROVm2lXN G5YdBu3KGhSQ1rIhCO9NX75lhkOqI0tda8T5bWAxx2k4pUn0XKVJO+bHq3JSgcMkhD0C Cueg== X-Gm-Message-State: AOAM5339jJHHEVkwRM194MUoSH6Zh9UmWktsQ7vKRzJyQwsVft9zTFLj gjskgHH6yZVZk1ZNng6MzL8jhY4zGAE= X-Google-Smtp-Source: ABdhPJxwDiLMEMJ1Of+KwOuZlPywmuCBHQLKvshcf6pnBYCnkHbC5jdDWXjyVo9CaP4FS2sSLQrZHQ== X-Received: by 2002:adf:ec90:: with SMTP id z16mr19166353wrn.145.1600155637529; Tue, 15 Sep 2020 00:40:37 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1fb0f.dynamic.kabel-deutschland.de. [188.193.251.15]) by smtp.gmail.com with ESMTPSA id d23sm6112125wmb.6.2020.09.15.00.40.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Sep 2020 00:40:37 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 15 Sep 2020 09:39:41 +0200 Message-Id: <20200915074000.102622-11-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200915074000.102622-1-andreas.rheinhardt@gmail.com> References: <20200915074000.102622-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 11/30] avcodec/hnm4video: Don't reimplement FFSWAP() 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/hnm4video.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/libavcodec/hnm4video.c b/libavcodec/hnm4video.c index 173691a1eb..43baa9c572 100644 --- a/libavcodec/hnm4video.c +++ b/libavcodec/hnm4video.c @@ -387,15 +387,6 @@ static void hnm_update_palette(AVCodecContext *avctx, uint8_t *src, } } -static void hnm_flip_buffers(Hnm4VideoContext *hnm) -{ - uint8_t *temp; - - temp = hnm->current; - hnm->current = hnm->previous; - hnm->previous = temp; -} - static int hnm_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPacket *avpkt) { @@ -450,7 +441,7 @@ static int hnm_decode_frame(AVCodecContext *avctx, void *data, frame->key_frame = 0; memcpy(frame->data[1], hnm->palette, 256 * 4); *got_frame = 1; - hnm_flip_buffers(hnm); + FFSWAP(uint8_t *, hnm->current, hnm->previous); } else { av_log(avctx, AV_LOG_ERROR, "invalid chunk id: %d\n", chunk_id); return AVERROR_INVALIDDATA;