From patchwork Thu Apr 23 03:07: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: 19188 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 E278F44BA43 for ; Thu, 23 Apr 2020 06:08:25 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D1F6768BE3A; Thu, 23 Apr 2020 06:08:25 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CCE9068BE00 for ; Thu, 23 Apr 2020 06:08:18 +0300 (EEST) Received: by mail-wm1-f67.google.com with SMTP id v4so6365135wme.1 for ; Wed, 22 Apr 2020 20:08:18 -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=fzff2u1Kcus8kPKyVmmgcdKhUtcukHK5YwgtqCabcUo=; b=aLa+VAMLAmA1bTVKPYrpyoJdXkPnwhZBxNMM7SUQQFoTXWy4TbbtlGhkCdS3DRAfDu NSHU/0xV2iOoM31BXK9Fmh8ozW4RrkUud7y02ZSourWYYoUvWDLt13AUcmCIqLqJ1H/g SSdYtgDBNdFiV5GX6L0JCR05UyX1PbYvXLeutq2GZAmwEpA7Zk11RfzNbmoN8XXzgP0G Cas5glmKhjy7YDWjur7qk6Sukme7Bfm/ptqg9G2qON7VFhAcoWwaBG6zmnaoDfJUF0MI Afmd3rcosqo5WEd79gOi/2ZTvlKqYGr58dIr1HG5YplrgHI4lSVFSLQueZznkDeS/YWC 6FxA== 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=fzff2u1Kcus8kPKyVmmgcdKhUtcukHK5YwgtqCabcUo=; b=Wx1w+bpvzfwPFXTRXclbTkBubU4wHDedkxq6vQoq1nQZ1Nkcmm91/LWXTI9j8Vj0NV 7RWtE0c5JMTAZNUPyiXv4hU4t9fdbuq6Ry5tX3XRW/gRxFSSUGX+JInoPfw5KCysN6Ej 2adBkAOfjTb+Z+ZNzX27kzNWjwiY0VSLtyJ/yU71mGuOFcRiSAUEJ0Rc08RFrZtnuVqF 5IDfqP1J7T/80un1cR0bu8Upyabh4Ho6D9u7S5JaYJtnw9YTDzrEohnJMU2ua6+FFHVK AuyUqqxAjt/WW1wArMnyjKji1JdgqX20R1TeLy4Wr4OK9bEpSfFEsJLJ+/cbHKNzdLLt VHZw== X-Gm-Message-State: AGi0PuZaKkXBjhCtBnOg6k4D4QLjKM04RNz8oS+4kLpfp4skPVuH5abx RZrk2nf/NLeT/7OOz29Dj4FQ5G24 X-Google-Smtp-Source: APiQypLGojRdQ7zQPEQMjaLaogAnIq0wkDsIt9LPWUNZNjZzIfnDyuzRl5tQepSXgbKKIR8B167IPQ== X-Received: by 2002:a7b:cf1a:: with SMTP id l26mr1719495wmg.114.1587611297770; Wed, 22 Apr 2020 20:08:17 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id m1sm1497733wro.64.2020.04.22.20.08.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Apr 2020 20:08:17 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 23 Apr 2020 05:07:41 +0200 Message-Id: <20200423030741.12158-11-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200423030741.12158-1-andreas.rheinhardt@gmail.com> References: <20200423030741.12158-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 11/11] avformat/matroskadec: Cosmetics 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" Reindentation as well as marking several variables used for demuxing RealAudio as const to clearly see that they don't change during demuxing. Signed-off-by: Andreas Rheinhardt --- libavformat/matroskadec.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index c16e18cb22..917c106258 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -3119,12 +3119,12 @@ static int matroska_parse_rm_audio(MatroskaDemuxContext *matroska, uint8_t *data, int size, uint64_t timecode, int64_t pos) { - int a = st->codecpar->block_align; - int sps = track->audio.sub_packet_size; - int cfs = track->audio.coded_framesize; - int h = track->audio.sub_packet_h; + const int a = st->codecpar->block_align; + const int sps = track->audio.sub_packet_size; + const int cfs = track->audio.coded_framesize; + const int h = track->audio.sub_packet_h; + const int w = track->audio.frame_size; int y = track->audio.sub_packet_cnt; - int w = track->audio.frame_size; int x; if (!track->audio.pkt_cnt) { @@ -3282,14 +3282,14 @@ static int matroska_parse_prores(MatroskaTrack *track, uint8_t *dst; int dstlen = *size + 8; - dst = av_malloc(dstlen + AV_INPUT_BUFFER_PADDING_SIZE); - if (!dst) - return AVERROR(ENOMEM); + dst = av_malloc(dstlen + AV_INPUT_BUFFER_PADDING_SIZE); + if (!dst) + return AVERROR(ENOMEM); - AV_WB32(dst, dstlen); - AV_WB32(dst + 4, MKBETAG('i', 'c', 'p', 'f')); - memcpy(dst + 8, *data, dstlen - 8); - memset(dst + dstlen, 0, AV_INPUT_BUFFER_PADDING_SIZE); + AV_WB32(dst, dstlen); + AV_WB32(dst + 4, MKBETAG('i', 'c', 'p', 'f')); + memcpy(dst + 8, *data, dstlen - 8); + memset(dst + dstlen, 0, AV_INPUT_BUFFER_PADDING_SIZE); *data = dst; *size = dstlen;