From patchwork Thu Dec 26 10:53:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 16963 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 65490449D52 for ; Thu, 26 Dec 2019 12:53:58 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 404F4689831; Thu, 26 Dec 2019 12:53:58 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 662BD687FFE for ; Thu, 26 Dec 2019 12:53:51 +0200 (EET) Received: by mail-wr1-f68.google.com with SMTP id z7so23297174wrl.13 for ; Thu, 26 Dec 2019 02:53:51 -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=sq2UhlTrHcEoY/Zvt+IQ0eHWQawy0Al842PbJ2lpjUc=; b=oB464V3zSmzfiheyWzvXRG6mfEUwkV8dEUtf7A5SYKsKWfxUc9deZ1Oo4SSufMc/4z ZZ1404LfSLkad4X6Swf2CF/AmGAtPhTE2ztteHFI0tMiNuIMD2f760IROnXj2/xLINwi FQT2FlPJflnDh4oiM0/hIFuxo6fUR7yU9sv7G5fSkkOXoYCUKs2ljB6IPe/7peYSnCBu a18KpNJ6X46bsuAcYaTUvd27p03VWvqzJKA8zq9aerNQq7lsYlxmmMlnbGzpCYB7SAUa M3VCwKP4blCNH3OjwCpMoFkVABsbQOf1ITG3c4tQZzp7+R1YiCTjXwnXCeWjBnpNaxWM 1sUA== 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=sq2UhlTrHcEoY/Zvt+IQ0eHWQawy0Al842PbJ2lpjUc=; b=WxmzyuNycJ1fWqfLpJ/dhCztdJ34uMwVsndzrhJqd2QPaCw6ZbVRclkFb4q+n63xJA fRWfv7f5LfL8DJ+SL4QiUDA6qI+VJV189bi8fTzvm5uRn1iTYx5Qbl33tonC8pwFDbA5 7ohZJ3hMFZmHR8shvE8Zr6dErwwAq8bPfXQluSsFsph7jgbx9kldR1+M7Wq6B8Cx4La8 kLF0Xf2A6isnDOxZ6P9L4oO4JCbQZtnKc5HMuGTMDlT/rw3Yon/lsF+C1sdLpKGAveJr bMv4sX07koKUuVlmf2z504R8rBKM3UtG/OiLHS6X5jvVlJ28/ucfIMhbdWl6tyovf0GU JpLg== X-Gm-Message-State: APjAAAUAy6hIdT3WIwwCtn/EPzFVASfHeIoMo6HVlaLievoqf1QbDnW7 IxhO3R3UkO5qs1XyQy/57+htCAQc X-Google-Smtp-Source: APXvYqySY4ACVpBZZONTyVDwFxFHrbs2LOKQNkOvzttve79m0t3RQKWmwpFyfhDB4BPaOKqmEgXjdA== X-Received: by 2002:adf:8041:: with SMTP id 59mr42855272wrk.257.1577357630292; Thu, 26 Dec 2019 02:53:50 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc10203.dynamic.kabel-deutschland.de. [188.193.2.3]) by smtp.gmail.com with ESMTPSA id c68sm7997618wme.13.2019.12.26.02.53.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Dec 2019 02:53:49 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 26 Dec 2019 11:53:26 +0100 Message-Id: <20191226105342.11175-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 01/17] avformat/spdifenc: Replace write_trailer by deinit 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" The write_trailer function doesn't write anything anyway. It only frees memory. Signed-off-by: Andreas Rheinhardt --- libavformat/spdifenc.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libavformat/spdifenc.c b/libavformat/spdifenc.c index 4307942a44..d5f7d91e93 100644 --- a/libavformat/spdifenc.c +++ b/libavformat/spdifenc.c @@ -482,12 +482,11 @@ static int spdif_write_header(AVFormatContext *s) return 0; } -static int spdif_write_trailer(AVFormatContext *s) +static void spdif_deinit(AVFormatContext *s) { IEC61937Context *ctx = s->priv_data; av_freep(&ctx->buffer); av_freep(&ctx->hd_buf); - return 0; } static av_always_inline void spdif_put_16(IEC61937Context *ctx, @@ -560,7 +559,7 @@ AVOutputFormat ff_spdif_muxer = { .video_codec = AV_CODEC_ID_NONE, .write_header = spdif_write_header, .write_packet = spdif_write_packet, - .write_trailer = spdif_write_trailer, + .deinit = spdif_deinit, .flags = AVFMT_NOTIMESTAMPS, .priv_class = &spdif_class, };