From patchwork Wed Mar 27 11:18:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Diego Felix de Souza via ffmpeg-devel X-Patchwork-Id: 12472 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 4DF0D448C86 for ; Wed, 27 Mar 2019 13:20:35 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 38F1A68A8D8; Wed, 27 Mar 2019 13:20:35 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id ACFC468A106 for ; Wed, 27 Mar 2019 13:20:28 +0200 (EET) Received: by mail-wm1-f66.google.com with SMTP id f3so15815973wmj.4 for ; Wed, 27 Mar 2019 04:20:28 -0700 (PDT) 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=+EVEw/yNNKpooTYeldz3iqd8c69qqRC4vbT5r3A8uJ8=; b=Ww/vUp//ulxzNEBMVR2B8UuqZQHQiJ/OSxqgvnpGGcFCCXphvZ8xTRfiyYiobUIg6L 67vvZWItGcFVDOc5dryf0c22sqiNJuXn25Y680KssG8PPPBG0v/mPnVAOgdYWwY3zkdm ox5DkYNZxq8Q1kF/NmCZrIDQ0QDte73F0XX1izBDYdKrxqkeNPwjxCM75dbuhh2uWHsH iY0v19VX2/FCsKZZH48Bu94Mkm/HfCrkn8/PkZYVcUiRA6o9mDWpaN0OLxTcU0C+3GFh bzo97S7eWwmTDRxs8Ea8teyIngJuFlIR48nPv1yceUCLKmsLLbnDTi7gQKneSKhqtPnx cjWA== X-Gm-Message-State: APjAAAUO0IaGw3k4/1esOC54wgLIUfG4U024oj+oTet5YRyJRjf9PCJr rRA8qT7Uhri9LRLyfIrb5rXCsc849oE= X-Google-Smtp-Source: APXvYqyZ4GhTwrP+49hPZSEUhWfAVo4lf9FMGscLwkwgnBIyzWXjRtdVPpzs3FHJLiifrRQh/Lf3+w== X-Received: by 2002:a1c:eb14:: with SMTP id j20mr12806342wmh.32.1553685627944; Wed, 27 Mar 2019 04:20:27 -0700 (PDT) Received: from localhost.localdomain (ipbcc08c44.dynamic.kabel-deutschland.de. [188.192.140.68]) by smtp.googlemail.com with ESMTPSA id h10sm31745448wrs.27.2019.03.27.04.20.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Mar 2019 04:20:27 -0700 (PDT) To: ffmpeg-devel@ffmpeg.org Date: Wed, 27 Mar 2019 12:18:32 +0100 Message-Id: <20190327111852.3784-2-andreas.rheinhardt@googlemail.com> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20190327111852.3784-1-andreas.rheinhardt@googlemail.com> References: <20190308092604.3752-1-andreas.rheinhardt@googlemail.com> <20190327111852.3784-1-andreas.rheinhardt@googlemail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 01/21] avformat/matroskadec: Remove unused variables 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: , X-Patchwork-Original-From: Andreas Rheinhardt via ffmpeg-devel From: Diego Felix de Souza via ffmpeg-devel Reply-To: FFmpeg development discussions and patches Cc: Andreas Rheinhardt , robux4@ycbcr.xyz Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Andreas Rheinhardt --- libavformat/matroskadec.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 81e9bb9bff..48b1ba3872 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -322,7 +322,6 @@ typedef struct MatroskaDemuxContext { /* EBML stuff */ int num_levels; MatroskaLevel levels[EBML_MAX_DEPTH]; - int level_up; uint32_t current_id; uint64_t time_scale; @@ -1593,7 +1592,6 @@ static void matroska_convert_tags(AVFormatContext *s) static int matroska_parse_seekhead_entry(MatroskaDemuxContext *matroska, uint64_t pos) { - uint32_t level_up = matroska->level_up; uint32_t saved_id = matroska->current_id; int64_t before_pos = avio_tell(matroska->ctx->pb); MatroskaLevel level; @@ -1629,7 +1627,6 @@ static int matroska_parse_seekhead_entry(MatroskaDemuxContext *matroska, } /* seek back */ avio_seek(matroska->ctx->pb, before_pos, SEEK_SET); - matroska->level_up = level_up; matroska->current_id = saved_id; return ret; @@ -3564,7 +3561,7 @@ static int matroska_read_seek(AVFormatContext *s, int stream_index, MatroskaDemuxContext *matroska = s->priv_data; MatroskaTrack *tracks = NULL; AVStream *st = s->streams[stream_index]; - int i, index, index_min; + int i, index; /* Parse the CUES now since we need the index data to seek. */ if (matroska->cues_parsing_deferred > 0) { @@ -3591,7 +3588,6 @@ static int matroska_read_seek(AVFormatContext *s, int stream_index, if (index < 0 || (matroska->cues_parsing_deferred < 0 && index == st->nb_index_entries - 1)) goto err; - index_min = index; tracks = matroska->tracks.elem; for (i = 0; i < matroska->tracks.nb_elem; i++) { tracks[i].audio.pkt_cnt = 0; @@ -3600,7 +3596,7 @@ static int matroska_read_seek(AVFormatContext *s, int stream_index, tracks[i].end_timecode = 0; } - avio_seek(s->pb, st->index_entries[index_min].pos, SEEK_SET); + avio_seek(s->pb, st->index_entries[index].pos, SEEK_SET); matroska->current_id = 0; if (flags & AVSEEK_FLAG_ANY) { st->skip_to_keyframe = 0;