From patchwork Wed Aug 24 08:43:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 37435 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp2371022pzh; Wed, 24 Aug 2022 01:44:06 -0700 (PDT) X-Google-Smtp-Source: AA6agR69N0wOU94t3k6WMUX253Jjbp4mxuRvv5jNoIMVgSYXdWXxEAB+zXJ7Pj8T9AObqoPgxigP X-Received: by 2002:a17:907:a0c6:b0:73d:bf46:f06b with SMTP id hw6-20020a170907a0c600b0073dbf46f06bmr675476ejc.127.1661330646546; Wed, 24 Aug 2022 01:44:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661330646; cv=none; d=google.com; s=arc-20160816; b=Eq+lDGsNpZKAQDVHGkh02BBiYk7QtpuF/dT1Gb1gUhrUs2f4gER9lMG0yFM8pmFDCo I7eSVZeD/LnwormOIi4/iBfx7g4dDysqTQJvoY6Y2agpn9YT505+oED5UEz5fK/oyi/k XurZaQ6PeaYzS1E2qYfak5v1Q0GO7nW7Fg2i8vykJvBgp5qrYS48bhvYAJRPkWL4/+Yx Aor+d5mnEfTFDjOxY6Nn5BuPUXuycW4RDwe7yP5btGzS37HNAX3t26GEdMC+PTd7jZNj HvOD4YEh9qj+fuVDxOxURUes/xVK1qaFgqT9vXrJrtEC+xrfKW5RdGy6bE9frggibnZR NUeg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to; bh=bNjDypOrljTKzeccFmbRerM7QO9lDyfg8KjDO4Irhx0=; b=lHHIeW2B58k3kwbI/1TgdBD7/Zj/xJN0zKGqgKMkW2TXNceDbGlOCe2yhmdwdyFdiu 6y0wNu1o6rg6qfMvcJ7c1N8dipkTWTtSsP8tqVIO/M2wnWJ3kRwPyL9pwwHWnYEHxx9U SLTuwpnQLb6wBeAPkdSBmqhI2KJrhE03mNeXn1J0rmSH3Qh9nLiAlT55CN7uo60mxRpw YDzH3qTBgX4U4y6chIh0tzp0ID+YAxURU0z+EksLoARmJgqVkLf0wEsGHV8gsXcv7HCR OaxGVqC6OZ5uVXL2u9ruk/jWPrDMgC5cJInAYuuxAvIdiHzFgJMWHUYHilXVoaxdM7GM aicQ== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id sg30-20020a170907a41e00b007317ed6f18bsi1427242ejc.986.2022.08.24.01.44.06; Wed, 24 Aug 2022 01:44:06 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CD1BF68B9F7; Wed, 24 Aug 2022 11:43:51 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A16B368B9C1 for ; Wed, 24 Aug 2022 11:43:43 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 28CC8240D1A for ; Wed, 24 Aug 2022 10:43:43 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id hKCg3cYHq2z5 for ; Wed, 24 Aug 2022 10:43:42 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id 8F257240D0E for ; Wed, 24 Aug 2022 10:43:41 +0200 (CEST) Received: by libav.khirnov.net (Postfix, from userid 1000) id 757513A0520; Wed, 24 Aug 2022 10:43:35 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Wed, 24 Aug 2022 10:43:02 +0200 Message-Id: <20220824084318.333-2-anton@khirnov.net> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220824084318.333-1-anton@khirnov.net> References: <20220824084318.333-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 02/18] lavf/dv: remove DVMuxContext declaration from dv.h 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: TuOQRqE4fU2a DVMuxContext is only used inside dvenc.c, there is no reason for it to be visible outside of that file. --- libavformat/dv.h | 4 +--- libavformat/dvenc.c | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/libavformat/dv.h b/libavformat/dv.h index 160c6ab873..efced6ccf0 100644 --- a/libavformat/dv.h +++ b/libavformat/dv.h @@ -1,5 +1,5 @@ /* - * General DV muxer/demuxer + * General DV demuxer * Copyright (c) 2003 Roman Shaposhnik * * Many thanks to Dan Dennedy for providing wealth @@ -36,6 +36,4 @@ int avpriv_dv_get_packet(DVDemuxContext*, AVPacket *); int avpriv_dv_produce_packet(DVDemuxContext*, AVPacket*, uint8_t*, int, int64_t); void ff_dv_offset_reset(DVDemuxContext *c, int64_t frame_offset); -typedef struct DVMuxContext DVMuxContext; - #endif /* AVFORMAT_DV_H */ diff --git a/libavformat/dvenc.c b/libavformat/dvenc.c index 7ef9692302..429ddcb96c 100644 --- a/libavformat/dvenc.c +++ b/libavformat/dvenc.c @@ -43,7 +43,7 @@ #define MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32-bit audio -struct DVMuxContext { +typedef struct DVMuxContext { AVClass *av_class; const AVDVProfile* sys; /* current DV profile, e.g.: 525/60, 625/50 */ int n_ast; /* number of stereo audio streams (up to 2) */ @@ -55,7 +55,7 @@ struct DVMuxContext { int has_video; /* frame under construction has video */ uint8_t frame_buf[DV_MAX_FRAME_SIZE]; /* frame under construction */ AVTimecode tc; /* timecode context */ -}; +} DVMuxContext; static const int dv_aaux_packs_dist[12][9] = { { 0xff, 0xff, 0xff, 0x50, 0x51, 0x52, 0x53, 0xff, 0xff },