From patchwork Fri Jan 17 20:00:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 17398 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 500CB4498FA for ; Fri, 17 Jan 2020 22:08:30 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2C02468AE56; Fri, 17 Jan 2020 22:08:30 +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 AAE4668A821 for ; Fri, 17 Jan 2020 22:08:23 +0200 (EET) Received: by mail-wm1-f66.google.com with SMTP id p9so8622557wmc.2 for ; Fri, 17 Jan 2020 12:08:23 -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=CxN/85qwqT6QCUKi3pxYoKXlYxHKzis4ULjVWdczbxU=; b=BhiBSFGi8QZF0liWFcsSYcmnBHDYxyO6pDPQOJyltMQDL8ibw/6zZmx8+9DCvtf3pg +s2MPdl14IhqAk5NgktBLD5xOpIBA9uRwJL3l1OOAKWgjUWo7dhh8QQFdf6iz0I1wlFp a7IEf5OKGM43G59dgmVayijVPLtETOmImqgkB7wVTqU4AlinoHaEjtKxReNTdL1ojOGh OOKIm4dZfLmnZOBgSCGUu95c/IGlqVQh20JVpzdIDpA92tUt6N3ABgbMRF7H4K1ekN4a 4q7M/LI8wxAZYvKCCZJrszqawQYtxgsfpb2U/j42ZPyAqPGtP4hmkb5yosS0K13aETov yByg== 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=CxN/85qwqT6QCUKi3pxYoKXlYxHKzis4ULjVWdczbxU=; b=aP70filRAdT2WpmCWlyVFr+PjU9wVqSRI6ZoPv2E5m6tfMtc+gIFLr/fHsiJq/Z0oE zljJSO5ZAGZJz6P6NZhDGOitOh+lLXicXtEs6JEH6atApZ5+wdFaIG9KtWMLO7XW69er sj5GEF6ZePfu462YTZDDC3pj4CdUJCXI8Zfhynme5YzgfcDUZI5P3P55nFEl78HO9GuN VKEBOYuJRLq9t8DC8Tnqi+T0CRvowGsqzjvTYA0mQg2xBeKkjZbU8YvjpZ5om75sgd81 U99SQwOPMIyjVxi9cQ6UqmYGp1J/IspvXB4B6arumtxoPhvZDBikGYWjbHrpNMHS2bFL Z6tw== X-Gm-Message-State: APjAAAVaZK7JP5cjDd76iYg8R8VurCVzz+iQ9VQNLc0xnSoVhqq2DUoW attp+AlrcqNtIqOd82q2cHywZx3C X-Google-Smtp-Source: APXvYqwEo/QxSbIZBPuWEToaXCytVcO2hKCVIBIQBRmiZeIBumWxCdHa08WDVrHMKgCLJ5Gzi0J/iA== X-Received: by 2002:a05:600c:2406:: with SMTP id 6mr6355729wmp.30.1579291257794; Fri, 17 Jan 2020 12:00:57 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc08bbf.dynamic.kabel-deutschland.de. [188.192.139.191]) by smtp.gmail.com with ESMTPSA id z187sm678124wme.16.2020.01.17.12.00.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Jan 2020 12:00:57 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 17 Jan 2020 21:00:51 +0100 Message-Id: <20200117200051.30727-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200101005837.11356-1-andreas.rheinhardt@gmail.com> References: <20200101005837.11356-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 23/23] avformat/matroskaenc: Reindent after previous commit 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" Also remove { } after an if if there is only one statement inside { }. Signed-off-by: Andreas Rheinhardt --- libavformat/matroskaenc.c | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 93f01da930..83ed43ab77 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1285,22 +1285,21 @@ static int mkv_write_track(AVFormatContext *s, MatroskaMuxContext *mkv, case AVMEDIA_TYPE_AUDIO: if (par->initial_padding && par->codec_id == AV_CODEC_ID_OPUS) { - int64_t codecdelay = av_rescale_q(par->initial_padding, - (AVRational){ 1, 48000 }, - (AVRational){ 1, 1000000000 }); - if (codecdelay < 0) { - av_log(s, AV_LOG_ERROR, "Initial padding is invalid\n"); - return AVERROR(EINVAL); - } -// mkv->tracks[i].ts_offset = av_rescale_q(par->initial_padding, -// (AVRational){ 1, par->sample_rate }, -// st->time_base); + int64_t codecdelay = av_rescale_q(par->initial_padding, + (AVRational){ 1, 48000 }, + (AVRational){ 1, 1000000000 }); + if (codecdelay < 0) { + av_log(s, AV_LOG_ERROR, "Initial padding is invalid\n"); + return AVERROR(EINVAL); + } +// mkv->tracks[i].ts_offset = av_rescale_q(par->initial_padding, +// (AVRational){ 1, par->sample_rate }, +// st->time_base); - put_ebml_uint(pb, MATROSKA_ID_CODECDELAY, codecdelay); - } - if (par->codec_id == AV_CODEC_ID_OPUS) { - put_ebml_uint(pb, MATROSKA_ID_SEEKPREROLL, OPUS_SEEK_PREROLL); - } + put_ebml_uint(pb, MATROSKA_ID_CODECDELAY, codecdelay); + } + if (par->codec_id == AV_CODEC_ID_OPUS) + put_ebml_uint(pb, MATROSKA_ID_SEEKPREROLL, OPUS_SEEK_PREROLL); put_ebml_uint(pb, MATROSKA_ID_TRACKTYPE, MATROSKA_TRACK_TYPE_AUDIO);