From patchwork Thu Jan 12 05:07:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Steven X-Patchwork-Id: 2190 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp1111510vsb; Wed, 11 Jan 2017 21:08:06 -0800 (PST) X-Received: by 10.194.78.195 with SMTP id d3mr7085725wjx.96.1484197686867; Wed, 11 Jan 2017 21:08:06 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id k188si818507wmd.64.2017.01.11.21.08.06; Wed, 11 Jan 2017 21:08:06 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0409C68A25E; Thu, 12 Jan 2017 07:07:57 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtpbg132.qq.com (SMTPBG132.QQ.COM [113.108.23.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D9A0368A24D for ; Thu, 12 Jan 2017 07:07:49 +0200 (EET) X-QQ-mid: bizesmtp3t1484197640tyzlesmgk Received: from localhost (unknown [47.90.47.25]) by esmtp4.qq.com (ESMTP) with id ; Thu, 12 Jan 2017 13:07:19 +0800 (CST) X-QQ-SSF: 01100000002000F0F721000A0000000 X-QQ-FEAT: pJiIyMrDeHuZ2CcX5lbsX6Te0DQHoexVS892udG0KYapdknJgK3M7Lbmpcz4h elNo1Nmh3vBZpNWfi4aw4cUlc47sC4y0qZNY4OW83VxtBRL1stYIIVtF1HfEpan2Base7V8 J02JJn3KrXAnV8aK4KtO+Lo2+bmGafB360PQDYhYN2cvh584drBNN5KYAJCT0PgLq5ZU+wW E41vYklJiO/A/p0r+1U6Vjwr7YIdOu40wAX2x+F88XEDByyQWTBQ3tytFlnN/EgIGdRwOHR TstjvwheNL9bT1 X-QQ-GoodBg: 0 From: Steven Liu To: ffmpeg-devel@ffmpeg.org Date: Thu, 12 Jan 2017 13:07:17 +0800 Message-Id: <20170112050717.17775-1-lq@chinaffmpeg.org> X-Mailer: git-send-email 2.10.1.382.ga23ca1b.dirty X-QQ-SENDSIZE: 520 X-QQ-Bgrelay: 1 Subject: [FFmpeg-devel] [PATCH] avformat/hlsenc: refine the hlsenc 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: Steven Liu MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" because the oc have been potint to hls->avf or hls->vtt_avf here is not needed point once again Signed-off-by: Steven Liu --- libavformat/hlsenc.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 772232b..fb98b01 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -1298,11 +1298,6 @@ static int hls_write_packet(AVFormatContext *s, AVPacket *pkt) return ret; } - if( st->codecpar->codec_type == AVMEDIA_TYPE_SUBTITLE ) - oc = hls->vtt_avf; - else - oc = hls->avf; - if ((ret = hls_window(s, 0)) < 0) { av_free(old_filename); return ret;