From patchwork Mon Mar 2 04:44:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 18003 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 6A950449CCD for ; Mon, 2 Mar 2020 06:45:14 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 55B3068B4D5; Mon, 2 Mar 2020 06:45:14 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 09EE968B499 for ; Mon, 2 Mar 2020 06:45:04 +0200 (EET) Received: by mail-wr1-f67.google.com with SMTP id y17so10786949wrn.6 for ; Sun, 01 Mar 2020 20:45:04 -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=0Usj7HyHAwb06t3fuiXvAfCoqj0OhwCwhNVu66/X4hY=; b=a+lfBM7vWMxNSvc5KE/wcMyP0vn3sgaKpJEzK8Gt4feOQaZ0qGJBS44cS61Z+hXm9Y JEQNsjWIJgIbOzlmzKlo74V/+aQFQFHXGs0FnVq1MzBEdU+u9AP2xHH53Awd+82eIzma vQBXnAw8nNYI3eAR/B6Dcm+QBGUDX5FdwGbU4K2Lbz4M3RU2jY8lztkSleD3eIU42+Ai VnZnNqZGd5Le7CX+HqQd0bzrpaghsBO3ZsUcIigFbj5VoK5N80DHF4Cby0z3OExp4I1l 4UPG9KQQ//ayyFowLO8s5rUMDVFI3PzkZu3YYR1KAmrrVoopWyJ2JLOrM3r8zvv20whB htig== 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=0Usj7HyHAwb06t3fuiXvAfCoqj0OhwCwhNVu66/X4hY=; b=m4nyJEV7mA8e+JU9/fNOgY8B5QED2mLC+GEZst5Qdn8RSY7Pw07Vahf9fFmjizjOht f0jrGhkhsgEKY9tjtaeSrSxPj61nFKzLKLD0l68PFHOg50sC5rPNp/HirKYfPd4kO2Qx o7Kon3HFam+KOT1eDzKmqbNF1xIu4LeTjdf67RPfjxexWWqlNGHrseU7r/j1Iv8AnP9V Xi6Aypwx3Hj4sTB95O7og6xx1D3GTs0eIRZn1RDkYahPiwNpMfuZsxTeuPWPaIairdhd tHmBqs4Fe5DRL+kuo3cqa5K3199BnxkaliKnOb1eDDq+J9Zo4YA7A02341ov2rQuir8k L6kg== X-Gm-Message-State: APjAAAWdLVj1Bz1/OJc/nDw+rx5zRvBbRUU20zAi6k8dLu4vAk5SIipj G8ApHeNAZCyExO9LKnTr7dNvUmlP X-Google-Smtp-Source: APXvYqzGmBcQiSzYRDc/KU9EqM8PJtk1B4M6ARN4uTGJ9tTK7FvDAuohSup+f+RtRt+KIwLO2Gln9Q== X-Received: by 2002:adf:f745:: with SMTP id z5mr18302149wrp.54.1583124303355; Sun, 01 Mar 2020 20:45:03 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1ab4b.dynamic.kabel-deutschland.de. [188.193.171.75]) by smtp.gmail.com with ESMTPSA id s22sm13130229wmc.16.2020.03.01.20.45.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 01 Mar 2020 20:45:02 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 2 Mar 2020 05:44:41 +0100 Message-Id: <20200302044445.14842-9-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 13/17] avformat/webm_chunk: Remove unnecessary variable 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" chunk_start_index (which was set via an option) was only used to initialize chunk_index and otherwise unused. So initialize chunk_index directly via the option and remove chunk_start_index. Signed-off-by: Andreas Rheinhardt --- libavformat/webm_chunk.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libavformat/webm_chunk.c b/libavformat/webm_chunk.c index a4aab04a44..8abfc2870b 100644 --- a/libavformat/webm_chunk.c +++ b/libavformat/webm_chunk.c @@ -46,7 +46,6 @@ typedef struct WebMChunkContext { const AVClass *class; - int chunk_start_index; char *header_filename; int chunk_duration; int chunk_index; @@ -152,7 +151,6 @@ static int webm_chunk_write_header(AVFormatContext *s) // DASH Streams can only have either one track per file. if (s->nb_streams != 1) { return AVERROR_INVALIDDATA; } - wc->chunk_index = wc->chunk_start_index; wc->prev_pts = AV_NOPTS_VALUE; ret = chunk_mux_init(s); @@ -274,7 +272,7 @@ fail: #define OFFSET(x) offsetof(WebMChunkContext, x) static const AVOption options[] = { - { "chunk_start_index", "start index of the chunk", OFFSET(chunk_start_index), AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM }, + { "chunk_start_index", "start index of the chunk", OFFSET(chunk_index), AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM }, { "header", "filename of the header where the initialization data will be written", OFFSET(header_filename), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, AV_OPT_FLAG_ENCODING_PARAM }, { "audio_chunk_duration", "duration of each chunk in milliseconds", OFFSET(chunk_duration), AV_OPT_TYPE_INT, {.i64 = 5000}, 0, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM }, { "method", "set the HTTP method", OFFSET(http_method), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, AV_OPT_FLAG_ENCODING_PARAM },