From patchwork Sat Aug 8 08:00:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zane van Iperen X-Patchwork-Id: 21530 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 C4EBF449212 for ; Sat, 8 Aug 2020 11:00:54 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A7F2468B841; Sat, 8 Aug 2020 11:00:54 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail1.protonmail.ch (mail1.protonmail.ch [185.70.40.18]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 68E0C68B817 for ; Sat, 8 Aug 2020 11:00:48 +0300 (EEST) Date: Sat, 08 Aug 2020 08:00:43 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zanevaniperen.com; s=protonmail; t=1596873647; bh=+eyATSOwL7dD8p3KFDvMs23bW/6PPpaWB0Rc5x+dqD8=; h=Date:To:From:Cc:Reply-To:Subject:In-Reply-To:References:From; b=KjXTqCPC4WdckxxslBiM/Y8lscjx8cEe0XzCFrIlIBPDjB8Q64yHiLESe+e5cEohR EFasnUZRPcfPoq8Kqp8IH9jnqW3bwEkQx546KNsdRjDZEkuwtNObRT/fsgon5YYbqy KtkMT7YhALP+P6rh8gIUrpjxn4CNf1Eybd/C45OA= To: ffmpeg-devel@ffmpeg.org From: Zane van Iperen Message-ID: <20200808075914.2296555-2-zane@zanevaniperen.com> In-Reply-To: <20200808075914.2296555-1-zane@zanevaniperen.com> References: <20200808075914.2296555-1-zane@zanevaniperen.com> MIME-Version: 1.0 X-Spam-Status: No, score=-1.2 required=7.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF shortcircuit=no autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on mail.protonmail.ch Subject: [FFmpeg-devel] [PATCH 2/6] avformat/argo_asf: rename ArgoASFDemuxContext to ArgoASFContext 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: Zane van Iperen Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Zane van Iperen --- libavformat/argo_asf.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavformat/argo_asf.c b/libavformat/argo_asf.c index beec46a0d4..52e37f9c10 100644 --- a/libavformat/argo_asf.c +++ b/libavformat/argo_asf.c @@ -63,11 +63,11 @@ enum { ASF_CF_ALWAYS0 = ~(ASF_CF_BITS_PER_SAMPLE | ASF_CF_STEREO | ASF_CF_ALWAYS1) }; -typedef struct ArgoASFDemuxContext { +typedef struct ArgoASFContext { ArgoASFFileHeader fhdr; ArgoASFChunkHeader ckhdr; uint32_t blocks_read; -} ArgoASFDemuxContext; +} ArgoASFContext; #if CONFIG_ARGO_ASF_DEMUXER static void argo_asf_parse_file_header(ArgoASFFileHeader *hdr, const uint8_t *buf) @@ -104,7 +104,7 @@ static int argo_asf_read_header(AVFormatContext *s) int64_t ret; AVIOContext *pb = s->pb; AVStream *st; - ArgoASFDemuxContext *asf = s->priv_data; + ArgoASFContext *asf = s->priv_data; uint8_t buf[FFMAX(ASF_FILE_HEADER_SIZE, ASF_CHUNK_HEADER_SIZE)]; if (!(st = avformat_new_stream(s, NULL))) @@ -198,7 +198,7 @@ static int argo_asf_read_header(AVFormatContext *s) static int argo_asf_read_packet(AVFormatContext *s, AVPacket *pkt) { - ArgoASFDemuxContext *asf = s->priv_data; + ArgoASFContext *asf = s->priv_data; AVStream *st = s->streams[0]; AVIOContext *pb = s->pb; @@ -227,7 +227,7 @@ static int argo_asf_read_packet(AVFormatContext *s, AVPacket *pkt) AVInputFormat ff_argo_asf_demuxer = { .name = "argo_asf", .long_name = NULL_IF_CONFIG_SMALL("Argonaut Games ASF"), - .priv_data_size = sizeof(ArgoASFDemuxContext), + .priv_data_size = sizeof(ArgoASFContext), .read_probe = argo_asf_probe, .read_header = argo_asf_read_header, .read_packet = argo_asf_read_packet