From patchwork Thu May 16 22:29:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 13148 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 806DF44964F for ; Fri, 17 May 2019 01:43:09 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4D504680714; Fri, 17 May 2019 01:43:09 +0300 (EEST) 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 DB54D680714 for ; Fri, 17 May 2019 01:43:02 +0300 (EEST) Received: by mail-wm1-f66.google.com with SMTP id f204so5144237wme.0 for ; Thu, 16 May 2019 15:43:02 -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 :mime-version:content-transfer-encoding; bh=YHyP+pA9f9V+qG0Q76I4j5zF6PAYquZq1XNTRSHlCVY=; b=TB1t0IgoBQsepp/I3wdxk5t5dETCbdyz/rJzkO5AQSwC/xFbQgm5P3yMTu81h9q7pK 231eswzF3Ab7kwzhuFoeGCpTe2+pOYUkE/erel11J9aSlu5Wkhl18et0sg2XrSisIUwM eBTTfjdddWhxBslkyXDPGZ7cQUczWvSfaZfSavv1YnOtbUpmmtaeaxEGW1YrFh7SnpcI p90vmeZneepjMR/uhhPB7tw58GgFKjYzdMHjuqhuROgSsMycLDgzCS/9G/Cd6CHxkDEc Axo9jhxQnv2cbS6/6+EpLxjAibpfGC9mqETeBcW8ZF7RAuyRwF227Nf8K91MDny+j84V 2PKQ== 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=YHyP+pA9f9V+qG0Q76I4j5zF6PAYquZq1XNTRSHlCVY=; b=o6GmEUmiFt0th1zjKo0w/1KruL0hId4w33GcWoqOMbadcC6nbreP3KZjKnmMS/J01Q Y6lbJ7RWd8GK70ho5p2n+KEPC8CkJV2asjtX+AHapHOhXHUZZm6COY+o0lUkiIjpYVh3 D1FMxmI6U+xsTlMPdE1E5UBndPWaUZN6ZeFl5N18m3RJLvVEwxp6cF4FWU+g8yLhJP/H CrUVzodPIkgY310RubCKGUWfkeLJCHv+kWozBQBN/JOtzEmMNoNuiWW4hrjcpou+Oqeb udYzWqHdsaHfOsEeGmmjCmtVCpcny2Gg4My7nifkKytnX/6mFHOPudr1umurSBDx+doP qMwg== X-Gm-Message-State: APjAAAXGk/usTMTTFDvVyU+k8Zt/7Dzs9Ex6nQzX9Y+NJ+/8jdc80Vbh GPYhFtrRwRzCLNvkAfIj5Wx2Wi7t X-Google-Smtp-Source: APXvYqzCe3SDPwsgDQwGUZmU+eJMlO8rp4TRqQDfXfDHoMkIiduyDr7uNSglwvzoY6K/5L1pEVMcgA== X-Received: by 2002:a05:600c:23ce:: with SMTP id p14mr15148498wmb.36.1558046582273; Thu, 16 May 2019 15:43:02 -0700 (PDT) Received: from localhost.localdomain (ipbcc18715.dynamic.kabel-deutschland.de. [188.193.135.21]) by smtp.gmail.com with ESMTPSA id i185sm11168725wmg.32.2019.05.16.15.43.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 16 May 2019 15:43:01 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 17 May 2019 00:29:45 +0200 Message-Id: <20190516223018.30827-2-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190516223018.30827-1-andreas.rheinhardt@gmail.com> References: <20190516223018.30827-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 01/37] 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: , Reply-To: FFmpeg development discussions and patches Cc: Andreas Rheinhardt 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 cba2b3d1f8..ed901f19ab 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; @@ -1611,7 +1610,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; @@ -1647,7 +1645,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; @@ -3582,7 +3579,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) { @@ -3609,7 +3606,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; @@ -3618,7 +3614,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;