From patchwork Mon Aug 24 12:41:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 21878 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 0810444BCD7 for ; Mon, 24 Aug 2020 16:07:07 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DF8A6689CFF; Mon, 24 Aug 2020 16:07:06 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f171.google.com (mail-oi1-f171.google.com [209.85.167.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CC54B6880BE for ; Mon, 24 Aug 2020 16:06:59 +0300 (EEST) Received: by mail-oi1-f171.google.com with SMTP id o21so8127178oie.12 for ; Mon, 24 Aug 2020 06:06:59 -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=iEjs0K32+CFtz5A9fWej7K58ofxbBL++QOpVDtpqEbg=; b=A+GvkixfYYtNwYSirsMC3LapRuAEcINCAwyEUzCM5zkYBVfSbfl8XRIWaBbhDUqOCB vthIVVPvgDY6XL0gOClUr23lxz45Nq57j4KDHUJKz7B06196KTrzrH/hVyMaU2kQgG6x HmC9QYiwPFq/zASiQJMlJy5M35mSZlibHslf53ACpUtXBT6ITXfd3UvACwoRC1ZQrb8U BcrL7Qfwf+4be4XX1pSF57xL8FNEIup+99Ac1bk69Jit9WPbjDPYGqkeXhmGI36NnUQJ BsGdE95QbVR575Assfu+tBDQzDDJtyXj5IuvRwU0y+s+Cq43T+19eYQ38mNCBdBcmKXZ twAw== 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=iEjs0K32+CFtz5A9fWej7K58ofxbBL++QOpVDtpqEbg=; b=cQKr/cgH2OCnrRMYtnmYX/5yAlKX57WSFjGd/AVQTCKJhkOIXaQldI+mqdLUD0cRhT YBLP4a375SN1LDQmmFYimjacAZPf8WA11arqjZdS+rSKEkGMQidlGyGUcaTuD8uRCpco PIoF2DH592dGwbFdNsYjSRHGIN4GWBvaEGESHF3IawceV4sWLB+PmAOlM88ChoVb+dJY ISmI4HdLGT2gnteWs+sEkmJBO09V9wlzL1MrToFVJ7a+HL9yXaT63rpKXRN+Tenm9/st OKi3jKwSjIvLNHSpdz3cfKPCH1LFXeacOx8ozwRyCsQKeMVzSg5rOfMDG/6oEIEaqWMR qN0w== X-Gm-Message-State: AOAM533/GPwU3HCGZkKdROX6Oo0MLCvPO4ioGgfzqJZd8IicCUNDrz6o c/Ph/Pu5sU7gT8myJjbX4t4QGWY2GeQ= X-Google-Smtp-Source: ABdhPJyuH3T6bVG5HEzfPXhDjhg3M97xfgBNe7LUxcPmCe1r6tGEeLR9Zbx6a6ow//gmauJLNPH01Q== X-Received: by 2002:a17:90a:a794:: with SMTP id f20mr4583588pjq.74.1598273060872; Mon, 24 Aug 2020 05:44:20 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id a1sm3964847pfd.65.2020.08.24.05.44.19 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 24 Aug 2020 05:44:20 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 24 Aug 2020 20:41:39 +0800 Message-Id: <1598272899-24222-2-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1598272899-24222-1-git-send-email-lance.lmwang@gmail.com> References: <1595431659-664-7-git-send-email-lance.lmwang@gmail.com> <1598272899-24222-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v2 2/2] avformat/mpegtsenc: reindent the code 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Signed-off-by: Limin Wang --- libavformat/mpegtsenc.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c index 5a9e6fd..1559ce6 100644 --- a/libavformat/mpegtsenc.c +++ b/libavformat/mpegtsenc.c @@ -1744,24 +1744,24 @@ static int mpegts_write_packet_internal(AVFormatContext *s, AVPacket *pkt) av_log(s, AV_LOG_ERROR, "AAC bitstream not in ADTS format " "and extradata missing\n"); } else { - av_init_packet(&pkt2); - pkt2.data = pkt->data; - pkt2.size = pkt->size; - av_assert0(pkt->dts != AV_NOPTS_VALUE); - pkt2.dts = av_rescale_q(pkt->dts, st->time_base, ts_st->amux->streams[0]->time_base); - - ret = avio_open_dyn_buf(&ts_st->amux->pb); - if (ret < 0) - return ret; - - ret = av_write_frame(ts_st->amux, &pkt2); - if (ret < 0) { - ffio_free_dyn_buf(&ts_st->amux->pb); - return ret; - } - size = avio_close_dyn_buf(ts_st->amux->pb, &data); - ts_st->amux->pb = NULL; - buf = data; + av_init_packet(&pkt2); + pkt2.data = pkt->data; + pkt2.size = pkt->size; + av_assert0(pkt->dts != AV_NOPTS_VALUE); + pkt2.dts = av_rescale_q(pkt->dts, st->time_base, ts_st->amux->streams[0]->time_base); + + ret = avio_open_dyn_buf(&ts_st->amux->pb); + if (ret < 0) + return ret; + + ret = av_write_frame(ts_st->amux, &pkt2); + if (ret < 0) { + ffio_free_dyn_buf(&ts_st->amux->pb); + return ret; + } + size = avio_close_dyn_buf(ts_st->amux->pb, &data); + ts_st->amux->pb = NULL; + buf = data; } } } else if (st->codecpar->codec_id == AV_CODEC_ID_HEVC) {