From patchwork Thu Jan 23 16:08:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 17491 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 864E544BAAD for ; Thu, 23 Jan 2020 18:08:54 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7210768B3B6; Thu, 23 Jan 2020 18:08:54 +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 8C8DF68B098 for ; Thu, 23 Jan 2020 18:08:47 +0200 (EET) Received: by mail-wm1-f66.google.com with SMTP id m24so3144477wmc.3 for ; Thu, 23 Jan 2020 08:08:47 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=X9PtV1im8aCCDpx2VM1I62YgpLqb7J6kjbfv5lHdS4I=; b=AeJB/mCcfoXwyjn9alXoDZ379UCv+fAf6ozIkTEdc2ZBjg/zaCcmzAEtXP+x7O7t6x u+Gk60MWf+7ryCpKDTvOKO3iSr1s7B+VixoEQ7ogzq7+7bPdt70XjEAJNpPU8coTrro9 CuyGcVcbB0oSgxSrZzwGUtmVK7vGLX8kS/6vgEx+ADnceGDGiXaaFXkSdKuAzcDS1caJ iJiInOXpqV2yTyBmY7lKawrDHe0TDN7haPmJmdWIvuDM7lYh3YhzLtcL5OA/2c21sv+A pUIm7t93cHD1IqwrPicJ8Mz6DJYiE4dGmHuIFwBewiifpreoJs6Tk3eOikpDXYyF2p64 8vjA== 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=X9PtV1im8aCCDpx2VM1I62YgpLqb7J6kjbfv5lHdS4I=; b=hQ/JOI+XqeRZF2w6rT4scYg6iSxu+Cu8cP19koQDDP6Cd98JJ0PYNltSG+297DLVxM uPkvYKji7cJN5/q3nVLzDciBKVmf3sdQxHBBUqXOkS/j9TcAowZ/C2ps7LHrEqp6/OJD P2f2MZFroUWuvHS0iakYCnH9FiOxQodlbzFJKjUwuP+VPLqfxWLJQybgYikA4Dg1v4NQ akfJVKGTZpZgCynOoFFKWRluxb7vlqeaMs5zpnisXvTOr+G0EU8ww278EEeEW6KkIGp8 8F3nHlNkNqqpebGDAH9OH0Ez9+YyX3+fU7mwEwkg8I5eemsSxT6N/pA9dAxSuVscNyla PTzQ== X-Gm-Message-State: APjAAAUceAaHUfJY4CEQhFsZ7uRgBPdf4PfcDoGXV/cZvMp7z6uXcA0p GP40MCoDy/nXwmge1+bb1Dwxq0fo X-Google-Smtp-Source: APXvYqyZjAL5thH0XC8Fq0xd/dvTjLpf7EUC0fTrUwX+yR45m743udi1k74u9lpPgE6fwUR3lLlUiQ== X-Received: by 2002:a1c:80d4:: with SMTP id b203mr5029901wmd.102.1579795726836; Thu, 23 Jan 2020 08:08:46 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc08bbf.dynamic.kabel-deutschland.de. [188.192.139.191]) by smtp.gmail.com with ESMTPSA id o187sm3678419wme.36.2020.01.23.08.08.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Jan 2020 08:08:46 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 23 Jan 2020 17:08:28 +0100 Message-Id: <20200123160832.2020-2-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200123160832.2020-1-andreas.rheinhardt@gmail.com> References: <20200123160832.2020-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/6] avformat/matroskaenc: 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" Add {, } in situations like if () ... else if () /* Comment */ ... else ... Signed-off-by: Andreas Rheinhardt --- libavformat/matroskaenc.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index a72bcb0ba1..20bad95262 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -2103,16 +2103,17 @@ static int mkv_write_block(AVFormatContext *s, AVIOContext *pb, "at offset %" PRId64 ". TrackNumber %d, keyframe %d\n", pkt->size, pkt->pts, pkt->dts, pkt->duration, avio_tell(pb), mkv->cluster_pos, track_number, keyframe != 0); + if (par->codec_id == AV_CODEC_ID_H264 && par->extradata_size > 0 && - (AV_RB24(par->extradata) == 1 || AV_RB32(par->extradata) == 1)) + (AV_RB24(par->extradata) == 1 || AV_RB32(par->extradata) == 1)) { err = ff_avc_parse_nal_units_buf(pkt->data, &data, &size); - else if (par->codec_id == AV_CODEC_ID_HEVC && par->extradata_size > 6 && - (AV_RB24(par->extradata) == 1 || AV_RB32(par->extradata) == 1)) + } else if (par->codec_id == AV_CODEC_ID_HEVC && par->extradata_size > 6 && + (AV_RB24(par->extradata) == 1 || AV_RB32(par->extradata) == 1)) { /* extradata is Annex B, assume the bitstream is too and convert it */ err = ff_hevc_annexb2mp4_buf(pkt->data, &data, &size, 0, NULL); - else if (par->codec_id == AV_CODEC_ID_AV1) + } else if (par->codec_id == AV_CODEC_ID_AV1) { err = ff_av1_filter_obus_buf(pkt->data, &data, &size); - else if (par->codec_id == AV_CODEC_ID_WAVPACK) { + } else if (par->codec_id == AV_CODEC_ID_WAVPACK) { err = mkv_strip_wavpack(pkt->data, &data, &size); } else data = pkt->data; @@ -2133,7 +2134,6 @@ static int mkv_write_block(AVFormatContext *s, AVIOContext *pb, side_data = av_packet_get_side_data(pkt, AV_PKT_DATA_SKIP_SAMPLES, &side_data_size); - if (side_data && side_data_size >= 10) { discard_padding = av_rescale_q(AV_RL32(side_data + 4), (AVRational){1, par->sample_rate},