From patchwork Tue May 26 16:57:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 19880 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 A21F844A094 for ; Tue, 26 May 2020 20:23:16 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8518B688341; Tue, 26 May 2020 20:23:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io1-f65.google.com (mail-io1-f65.google.com [209.85.166.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EF6CA680AE5 for ; Tue, 26 May 2020 20:23:09 +0300 (EEST) Received: by mail-io1-f65.google.com with SMTP id o5so22873177iow.8 for ; Tue, 26 May 2020 10:23:09 -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; bh=q4XOD705AecPTtr5mW/l5WZY6pTHAM8ZqN43osbped8=; b=qNu3pREhGLxtq0TjBLOA5cvQ3qvLoiQs8Hae21sm5GBxyU0l7RnW7KfkAStc/V59go pcBhxCuXc83QvhogeDmCXk0Z83uVmCsGmeH5aXSzF/diFrqFyjinPn8pRHnOf56/UwHN W0tI2jT2MemF+MLojH1IroCO/fLeuKjEDIi8LMePf3ZlXyLOpFqkXNBSUQgQM8oSGbs4 yXP9SM/ntiXEqIMMEbiGjKWE7pmLRFCF88pyR6ezlW3zljfUGpG1naLjT6uJAuh+P+BU dktJz8a+vaUBRdiKTsqj56ThgKwJcsF48XFBBOzUaR86lVBY2dYpBdpigsCPlk9PHCgF kR2w== 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; bh=q4XOD705AecPTtr5mW/l5WZY6pTHAM8ZqN43osbped8=; b=jM++iK319OqnAA2tFIbfu+A8KmRR2cExZNcNZ4X0YxqdRGemQs5zNDMHfEkTm4JQY8 utrzxz9Vov4MarX+t8C+d3bn00ly9EBiC1p9ZCPR88c2N7BCoQ34NQfRx8dBpjjc/gJ+ Me81gqsNxKDHUZlfn3ntkGZNCIbP7qlhxnSBw1/3spWbq8u3zpSnwBgFqpL9I65mF10o wFD8iirrxF/iHXmB0V+hobfu3kKLPGfU9RnxaYdfvwlhJW4Efs+p3hCYpSPCjuQizWOu 3CjtCLiLTxdstoMcOllWgcJQsWcTopRkj6iR+lbiwB5hYIl726fu7YffGlRKuFokoHW6 NTUg== X-Gm-Message-State: AOAM530lnPvLezVznjHaDEKieWeb5DjEgK6NKRlHZpgoY15B7eYYhDgP lzFoUa6nbr+xjwqJeChnp/ynsjze X-Google-Smtp-Source: ABdhPJyIfPrGa40jx3OBhPBK/HtRZmwn3pwwi0iNPNfEiMpSow59hHPRkydV0N7R6QCmjC7AnXPm9A== X-Received: by 2002:a63:9258:: with SMTP id s24mr1965398pgn.362.1590512269108; Tue, 26 May 2020 09:57:49 -0700 (PDT) Received: from localhost.localdomain ([49.51.162.193]) by smtp.gmail.com with ESMTPSA id h21sm57159pjz.6.2020.05.26.09.57.46 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 May 2020 09:57:48 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Wed, 27 May 2020 00:57:10 +0800 Message-Id: <1590512230-26007-4-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1590512230-26007-1-git-send-email-mypopydev@gmail.com> References: <1590512230-26007-1-git-send-email-mypopydev@gmail.com> Subject: [FFmpeg-devel] [PATCH v2 4/4] lavf/mpegtsenc: misc style fixes 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: Jun Zhao MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Jun Zhao commit 32aeba12755 missed coding style fix. Signed-off-by: Jun Zhao --- libavformat/mpegtsenc.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c index bf1a7ee..de9819b 100644 --- a/libavformat/mpegtsenc.c +++ b/libavformat/mpegtsenc.c @@ -1432,10 +1432,10 @@ static void mpegts_write_pes(AVFormatContext *s, AVStream *st, if (ts->m2ts_mode && st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO && st->codecpar->codec_id == AV_CODEC_ID_AC3) { - /* set PES_extension_flag */ - pes_extension = 1; - flags |= 0x01; - header_len += 3; + /* set PES_extension_flag */ + pes_extension = 1; + flags |= 0x01; + header_len += 3; } if (is_dvb_teletext) { pes_header_stuffing_bytes = 0x24 - header_len; @@ -1478,14 +1478,14 @@ static void mpegts_write_pes(AVFormatContext *s, AVStream *st, *q++ = 0x00 | 0x60; } /* For Blu-ray AC3 Audio Setting extended flags */ - if (ts->m2ts_mode && - pes_extension && - st->codecpar->codec_id == AV_CODEC_ID_AC3) { - flags = 0x01; /* set PES_extension_flag_2 */ - *q++ = flags; - *q++ = 0x80 | 0x01; /* marker bit + extension length */ - *q++ = 0x00 | 0x71; /* for AC3 Audio (specifically on blue-rays) */ - } + if (ts->m2ts_mode && + pes_extension && + st->codecpar->codec_id == AV_CODEC_ID_AC3) { + flags = 0x01; /* set PES_extension_flag_2 */ + *q++ = flags; + *q++ = 0x80 | 0x01; /* marker bit + extension length */ + *q++ = 0x00 | 0x71; /* for AC3 Audio (specifically on blue-rays) */ + } if (is_dvb_subtitle) {