From patchwork Wed Jul 14 19:07:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 28928 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp693472ios; Wed, 14 Jul 2021 12:08:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzX+axRcsdaSlCOLAVokhTZ+wkvErPOAF6dLlNnnKdTNrDpvL54Jh29iJSn/bqOVl9Zamau X-Received: by 2002:a05:6402:1d37:: with SMTP id dh23mr15580624edb.360.1626289720250; Wed, 14 Jul 2021 12:08:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626289720; cv=none; d=google.com; s=arc-20160816; b=cRnZd7k5j77DqC3dfRhnIWbmLlfRSp3MoypSivqut2Og0uj/IywbB9cT5i7/v84Lwt CITw4LfopE7a3LahotMCc9RAnByu9nPHbPYoaHUWmc70kGOuVyFqwbWTTfs/87ud+XpN 5g46GDozlO7UMMp6Yy9XKnFdwCtM2ucAI5E2Hu25ptHXYOxH0OzXn0KSGf2DmsmRI7If ThmA2FTpjrcCfa2GCbtMwKVgZ2Z3bKKbM+zP5xNDR9vv4omhro6fWALf5Bb4qeAu4Wpx a2GEqMfy7x/47aFpkoS8JuOlvX0WFdqgcZMNdvaWLHJ+Jgj7WVw8il59Hri1VtzSVXqw md0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=z6SYS6zyI/E5nazGSHlumlG+Ygk297uEu/eaXcoSAmE=; b=g1/TNESg1CbINm104eKv5TId7lJ43+3m2v2eL6ZEdOArVGCOWcwEYCkFzIUfm6Rjax gsKe8FEBeH90MaGoIGI+lQfY0Qddpsv1E0+EBVC7K/eMVWwsN2InZVYZqIgIo2rX5BoK dsqzplDfwHEFSzhkOI27FHwdGTEDgdvGlR1uWhdNyAA4mwU7ZtxzxbNfgft2al9a6isF 7dEBg6TfPVKt2pMa+Uzs5Wdh9kAe1FYOrlWuyCjxmVSMzz7PpaFcrEjbNy824ob7Ixwo zJg9R0mwwXAQRBq9f5mf5jvID8PNvf2lfoc9dTQP1eSiDxR3hRI8yPfG58y2DFYyo40C VNlg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=hx90WNHt; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id my47si3692873ejc.645.2021.07.14.12.08.39; Wed, 14 Jul 2021 12:08:40 -0700 (PDT) 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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=hx90WNHt; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 24A6A68A987; Wed, 14 Jul 2021 22:08:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f174.google.com (mail-pg1-f174.google.com [209.85.215.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8BE1768A987 for ; Wed, 14 Jul 2021 22:08:30 +0300 (EEST) Received: by mail-pg1-f174.google.com with SMTP id t9so3502605pgn.4 for ; Wed, 14 Jul 2021 12:08:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=gAttoA7hjh6huNNw1kd7eBgUlmENtxmwjiv3B6PxZWw=; b=hx90WNHtIbwZUx5XNo0DVZEXzxHeQ5+Rrg+L9VG/LRyIDNaTk/YU/+y7zHhA2vhrX3 uBQ+5M928S6bMUOadjS1Hze1sIXuVlNqnEQ1I+PyZv/ziNxwsdaziDmccmfhFmBj+UwT 71YkpybLlPcMxWjuFFCuyDpjLsq3MILtHdDzr07wQDcNR8C5heGJ5C/h0/HJj1Q7LJJ6 BDE8yDkJcDV5woRVJPd2wEcwoNWmUVbcwpYT0rgZnHZst0Dx/VQQyX5hGBGzlgxcEvf4 LTfJA1DhmgHnwdc80J+4qe3JK61020Q/6LElYv4xao7lEfWRMPWTnX+YIskm4pU8k4y4 a+Tg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=gAttoA7hjh6huNNw1kd7eBgUlmENtxmwjiv3B6PxZWw=; b=Y4WxguL9f52A5Z1FKMuDbRHBXXZwJsyX9OTBOEmTb3DpEut4cFt23P4Ily1oPSTx3z ZSxoGxOkmvwqXJaHxJzDmBduQli/QGLCQ4uZkt10nERGhSfDz2y4h4XU3uc9es5x/wYH pIlfyLnT2kLy+p1tnRVoJaO+6zuHtc43yoZCIN3O2GjG85vsUssaatpjt/TTbed+MAp5 ATDPgcUhpZQ2UBd+l/kB2XSc2fdNAJgmaUQxDwI9TUSC8vT0BdJ9tScK2hZBlRFMugpz HrLzn+ml4T3cQ1b7MOK4jkE0HL1a9zwcqZUMyepLo678IFfFP0fFO8yU5sBIbAFj+iwB cIaQ== X-Gm-Message-State: AOAM531DHE8DjkovrjEd10N73Xt1PlNLziawRnsu3jzcggEEXqT68/ML U79zHbynDGsSpCv83nFikCfdAMGkrGo= X-Received: by 2002:a63:1324:: with SMTP id i36mr11156980pgl.8.1626289708631; Wed, 14 Jul 2021 12:08:28 -0700 (PDT) Received: from localhost.localdomain ([191.83.217.217]) by smtp.gmail.com with ESMTPSA id u15sm3816544pgf.77.2021.07.14.12.08.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jul 2021 12:08:28 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 14 Jul 2021 16:07:49 -0300 Message-Id: <20210714190749.4540-1-jamrial@gmail.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/utils: remove AVStreamInternal.orig_codec_id X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: qHbRo1tajQ1P It's a write only field. Signed-off-by: James Almer --- libavformat/internal.h | 2 -- libavformat/utils.c | 6 ------ 2 files changed, 8 deletions(-) diff --git a/libavformat/internal.h b/libavformat/internal.h index 240de9e289..4b7ab082e7 100644 --- a/libavformat/internal.h +++ b/libavformat/internal.h @@ -204,8 +204,6 @@ struct AVStreamInternal { */ int avctx_inited; - enum AVCodecID orig_codec_id; - /* the context for extracting extradata in find_stream_info() * inited=1/bsf=NULL signals that extracting is not possible (codec not * supported) */ diff --git a/libavformat/utils.c b/libavformat/utils.c index 998fddf270..efdb6f062f 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -604,9 +604,6 @@ int avformat_open_input(AVFormatContext **ps, const char *filename, update_stream_avctx(s); - for (i = 0; i < s->nb_streams; i++) - s->streams[i]->internal->orig_codec_id = s->streams[i]->codecpar->codec_id; - if (options) { av_dict_free(options); *options = tmp; @@ -3614,9 +3611,6 @@ int avformat_find_stream_info(AVFormatContext *ic, AVDictionary **options) } } - if (st->codecpar->codec_id != st->internal->orig_codec_id) - st->internal->orig_codec_id = st->codecpar->codec_id; - ret = avcodec_parameters_to_context(avctx, st->codecpar); if (ret < 0) goto find_stream_info_err;