From patchwork Mon Mar 2 04:35:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 17991 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 E0D9D449FD2 for ; Mon, 2 Mar 2020 06:43:46 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B937268AF81; Mon, 2 Mar 2020 06:43:46 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 26CAC68AE75 for ; Mon, 2 Mar 2020 06:43:40 +0200 (EET) Received: by mail-wm1-f65.google.com with SMTP id p9so9582551wmc.2 for ; Sun, 01 Mar 2020 20:43:40 -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=hzxJhZB1cSa7zRswsoq9RXf1yFE5INUkn9tPLnPhxBw=; b=oMsBrNwXOL2rjmv7md+Hobyu2sY1hO1EQNS+B9uKZzKT9D7QPEwexT0H1F15zVGUML rf1inLOUPFEEnId6kIBofA1Dfih+obOy4dXIe2bw8at3qRj9hV+LRTI1NqksuD16MOxW s4xky0wbrKUJ3GsNvbAdFOojMBy47Bs/lEh1z1qZ1k2JPKHOai39rHsIDoMG4AHWjzrQ 8gnvCm9Bcie1Owsq+Enj+3lDIj+pjs6ctUAjKlG1rRQE3eZW6ZcrjWZOMa5ruitkbKGS /EGKTmc3vYmgm/4ICeTXdKhpx+VOQX+27F4m7+WnugN+feyBOSSAH7SHMkl/y2p6C6Ri dJpA== 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=hzxJhZB1cSa7zRswsoq9RXf1yFE5INUkn9tPLnPhxBw=; b=Qyx9hxwr/bKlPiUyIV0gZ6YXSMWvzLayJwpKXkYhSfp+SRySgTP1kF4OYNKVZJHf8c GZ39QzeAQsSdE1Pvp4He/vm+v8jy0Mf06MphGhXgleYjN//WBCco60BdVd1AKTbBwAvD uPzzoQZbxdCH5MT8agHEIdN4ltR6K3Lf1e+d1ctFaWsaWDooQ6yweroioo51U1VAP4eK phQGO142hhB2oUI4s9Gcb0sl/LByYyS3dGCxz2AIYFlT/AWUob/eclfo5/6nhsbffHSa 1Ka5OEWG++Sz6oHxxECxlAZA8J0bWJf9ENUrcyFj5U7ZhccMjMWOhV7TEcSUKMRGHArU +rsQ== X-Gm-Message-State: APjAAAVT0IcMwLL1Y3iSwD9qCYsn5+807P5NenPUZD9CRggDRYiIs5Hk 8LOVhk9dYzbrpsa1ddBEQYFZ/5GB X-Google-Smtp-Source: APXvYqz9sXYrRKt+vXXkEEh9SG778l1AQovAM5mKZz5dxYT9ENQkSgf7EZdr80hS2hKsfh+3IAKVBQ== X-Received: by 2002:a1c:1982:: with SMTP id 124mr18402183wmz.83.1583123778913; Sun, 01 Mar 2020 20:36:18 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1ab4b.dynamic.kabel-deutschland.de. [188.193.171.75]) by smtp.gmail.com with ESMTPSA id g7sm20842429wrm.72.2020.03.01.20.36.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 01 Mar 2020 20:36:18 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 2 Mar 2020 05:35:18 +0100 Message-Id: <20200302043520.14165-2-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200302043520.14165-1-andreas.rheinhardt@gmail.com> References: <20200302043520.14165-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/17] avformat/hlsenc: Remove redundant setting of output format 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" avformat_alloc_output_context2() already sets the oformat member, so that there is no reason to overwrite it again with the value it already has. Signed-off-by: Andreas Rheinhardt --- libavformat/hlsenc.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index f6dd894343..e58da7328f 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -776,7 +776,6 @@ static int hls_mux_init(AVFormatContext *s, VariantStream *vs) if (!oc->url) return AVERROR(ENOMEM); - oc->oformat = vs->oformat; oc->interrupt_callback = s->interrupt_callback; oc->max_delay = s->max_delay; oc->opaque = s->opaque; @@ -790,7 +789,6 @@ static int hls_mux_init(AVFormatContext *s, VariantStream *vs) if (ret < 0) return ret; vtt_oc = vs->vtt_avf; - vtt_oc->oformat = vs->vtt_oformat; av_dict_copy(&vtt_oc->metadata, s->metadata, 0); }