From patchwork Mon Dec 7 00:11:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 24373 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 684114499CC for ; Mon, 7 Dec 2020 02:11:33 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3C76C68AA17; Mon, 7 Dec 2020 02:11:33 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5D31468A6B6 for ; Mon, 7 Dec 2020 02:11:27 +0200 (EET) Received: by mail-wm1-f66.google.com with SMTP id y23so502715wmi.1 for ; Sun, 06 Dec 2020 16:11:27 -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:mime-version :content-transfer-encoding; bh=o76h+vWR9nRUFhJMitcc9KQkbTmI47i/CK1ByYzx32U=; b=FhSk2MmIpEixEtx7Eg69xPuB0Irehvj4dm7LymAgLx5+TdaA982E8sMwx9NXiipskJ ijpVWj0XH59O9eswBEuv9JfA+XSyZwunLLzUFiZfxVg6/j82FGG6bkwOVIpNgEwECQsS SzUY79pPrqhboLdWc4quSUezXuiaCdGywySRwl+/xo2lV087SGAnukYXIISDZWb7Ep0o ubCCwXBw0ttMQeekG1SZB8y/z7YvOzVUW9u4NGa3JbVDidIeiG47rugNIpHGvZRCByWv Ibj8LGtI5rUYBqoMJDw0CDLhSJ1WWEYU7uA4bmJXTnIIzLRBzWOoNevVja7dXKDdhet+ WD3w== 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=o76h+vWR9nRUFhJMitcc9KQkbTmI47i/CK1ByYzx32U=; b=Tzozi+/kCNYRfn2hkT16e4nYaq/YHgb6HcSZRyGtDsdT9+pxr0/YxCUGkFQ6Wa4KXb oDJq8nyVKFLfFWd8J8DGzZtcQ0YL0fWLhHNJG3wENpNJNoLWG2Z+1ZQ9HbBxz4jRkbHs zTB8nmgBdldXkhq/qYBbriJL5m0n6wa9viRu5+tDrJYpLhvSNIpNYrGGsjdIBQf9SMkp LICVCqfRXX/NqY+mCyFdbYPx/9LwBu5veruZNWOG75busofu0zh7B1g/uFdMBuSY0BkY jFPTWlIBIFTZv4JsfEMlOo0LYhQeuAKHkiV1P1u9msXCyPSbAI+5BlvWesBbkV1GcuoI /yzA== X-Gm-Message-State: AOAM531E3tKvfM7nfh8Azb5EyGlnx1BZl059MFcISRNRm32pd2vXOaYm 59su5V58EcH549J4UTobJQYHtuEExzvn4Q== X-Google-Smtp-Source: ABdhPJzRIqIp7KPqRUMRQEiCw32Az2SVWz3IKdRUICH/O0Q1D1XfECAR9uYUis3HKMb95UclF7suPw== X-Received: by 2002:a1c:2646:: with SMTP id m67mr15675836wmm.81.1607299886244; Sun, 06 Dec 2020 16:11:26 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id o83sm11860293wme.21.2020.12.06.16.11.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 06 Dec 2020 16:11:25 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 7 Dec 2020 01:11:19 +0100 Message-Id: <20201207001119.524526-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/hashenc: Reuse hash_free() for framehash muxers 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 --- libavformat/hashenc.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/libavformat/hashenc.c b/libavformat/hashenc.c index ce609f6efa..5523dfd1cd 100644 --- a/libavformat/hashenc.c +++ b/libavformat/hashenc.c @@ -156,6 +156,7 @@ static int hash_write_trailer(struct AVFormatContext *s) return 0; } +#endif static void hash_free(struct AVFormatContext *s) { @@ -168,7 +169,6 @@ static void hash_free(struct AVFormatContext *s) } av_freep(&c->hashes); } -#endif #if CONFIG_HASH_MUXER static const AVClass hashenc_class = { @@ -326,14 +326,6 @@ static int framehash_write_packet(struct AVFormatContext *s, AVPacket *pkt) avio_printf(s->pb, "\n"); return 0; } - -static void framehash_free(struct AVFormatContext *s) -{ - struct HashContext *c = s->priv_data; - if (c->hashes) - av_hash_freep(&c->hashes[0]); - av_freep(&c->hashes); -} #endif #if CONFIG_FRAMEHASH_MUXER @@ -353,7 +345,7 @@ AVOutputFormat ff_framehash_muxer = { .init = framehash_init, .write_header = framehash_write_header, .write_packet = framehash_write_packet, - .deinit = framehash_free, + .deinit = hash_free, .flags = AVFMT_VARIABLE_FPS | AVFMT_TS_NONSTRICT | AVFMT_TS_NEGATIVE, .priv_class = &framehash_class, @@ -377,7 +369,7 @@ AVOutputFormat ff_framemd5_muxer = { .init = framehash_init, .write_header = framehash_write_header, .write_packet = framehash_write_packet, - .deinit = framehash_free, + .deinit = hash_free, .flags = AVFMT_VARIABLE_FPS | AVFMT_TS_NONSTRICT | AVFMT_TS_NEGATIVE, .priv_class = &framemd5_class,