From patchwork Fri Jul 5 05:25:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marth64 X-Patchwork-Id: 50364 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:cc64:0:b0:482:c625:d099 with SMTP id k4csp4098715vqv; Thu, 4 Jul 2024 23:04:06 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUh0UQ8EEZs0uz1h7XNaV/JQvw7jxdThkoTvcX/O2xMWBAM06VHJlqPy2FcmZ4431YoFSoRETP2EU4rMWYaSx11bOeojXxvp/dlTg== X-Google-Smtp-Source: AGHT+IHppF0PVf2Uc0GqRa30OpsO3YYW0oNx2c+4VrRVSZ1P+SgNAQK0LWoTAAtiDvJrTVB/OPGN X-Received: by 2002:a17:906:13db:b0:a77:cca9:b21c with SMTP id a640c23a62f3a-a77cca9b865mr42877866b.34.1720159446626; Thu, 04 Jul 2024 23:04:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1720159446; cv=none; d=google.com; s=arc-20160816; b=jRpZio+oCnssrZqDP0mZWAkRlp1auFMAjefwYCk+0cl8fo3E5JaLhg3yfGjom1ZV0K SLuPeekleNiFpmRaNhJ0eyZvDL9IDRuIAXg474jWL6p+MAl0v7tB+OWbGxYb8N/FOzYW Pd1ZH+lMz8toGT7v7+5VBS5HkvtvxLUJK8WHJsEk6OXyJ6FSwiK7PykYaUl/7rqRO71T 9ME9RD95CT7j6xPUUVwlwdFGmdx6+0KwIjEvzJVRivPn6nZZvJSd6vzkS9zjmsreT8CN 1gZikYl3ReSuWEhXxtBp/wWg6W4el0Un+cB+zVZUpAqx/JojIi4UNOKxGtuGERzsGF7K 3uWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=j98I4cEKSd3q8F7fdTebcacutmdtMBZK953zqDjWqq4=; fh=PlWMzmI9LD2qGS7ipLrQl8z0iaQTLQLHzoGuXcBzpCg=; b=qURa3JGZOL1jY95tUJuiAGfoWoFpJ5cNcjl+SjOOuzese2CryLClE4abbjnR8k+Y2B 2dXR/5aWR6Yph9aE1uNDBRueDMX/5xP/tF6NzYrafh0P7XJ0Mv6AEi/XJrQxuYOqTE10 E6zIHnUc8oGmu9gIJ3nT+/9AKFlrkbI1owq2+TMYLAXzyO0ulCmVBWNDezRi9GdUYHgW UHjmkRycFvRLvdqZA5iIDfMADZL0uxlOWx9HtjivX0zy3GyFztu/0qo34YvEWgSJiJ3a xdrjikho/vc/QyKjYV1tUPmXxZUunWZurUsy6//4JUizlMRNUZqbmlJPxo//3KAkMlzF DGJA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@proxyid.net header.s=google header.b=IJpJHg5i; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a640c23a62f3a-a77bfa866c8si135761366b.554.2024.07.04.23.04.06; Thu, 04 Jul 2024 23:04:06 -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=@proxyid.net header.s=google header.b=IJpJHg5i; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 92A3E68DADC; Fri, 5 Jul 2024 08:26:09 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oa1-f99.google.com (mail-oa1-f99.google.com [209.85.160.99]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8225D68CDA6 for ; Fri, 5 Jul 2024 08:26:00 +0300 (EEST) Received: by mail-oa1-f99.google.com with SMTP id 586e51a60fabf-25e3bc751daso383587fac.3 for ; Thu, 04 Jul 2024 22:26:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proxyid.net; s=google; t=1720157159; x=1720761959; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=8/AZk+2kjVw/cGT0CRs5Xort/xMsxgzmGWIJsAISf1Q=; b=IJpJHg5iN6iiftCkG1kabJrRusZVfiU4B835EiEdSZ+iXUDSdTNGMiblHY8/khtpHP i5hBEfS4Pipm/r6MnviaBdEBdJmg2enne5IG5g+4oqD8Y2Wse30UgwVsKTn1y/jk+KQH YAkYc8roeeyAmjdd73ZTzdCCGMM3QRlBuHyrExkxITvkyGTl6tUJfjKOHJXM1b/k4KGn Jm7C4URyVie5BJs7EXKBVOuV3cl+1wvPW4JAY21swSr2YJpvPvIvdsRudHZhtAuS4QMc mSWaK8CyEE5FGcXTa28DJqzqjIZpLQm7XcjACHOSYuDJlptrG9+jjKJJZgUhIWFryGTf 1G6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720157159; x=1720761959; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=8/AZk+2kjVw/cGT0CRs5Xort/xMsxgzmGWIJsAISf1Q=; b=kjv15+lTbpADHlGP2Ft/yPWgFmYjHfKBvCIRY8EzqrwQCvgOXKBTPCsIPuyXY5KQiE LMVJd2DHcjeD49hqMsEEiDm9SFBr6q2eV8EdelF4RE2VsxntKmdBj+UtoFsHj1bx+Sx6 NrOyo+zf91FmhXu8npGrex+G1XPKXCtux+VJ3NQnAGH+OYhqTl/kfcvokzvhqrCrOAzU fSfgR3BlOknZM/95buiF2JOO8JkT1P9RC7xrIGrXq+k0ax68LlTfQt89ubavfyGkzYJB nrvabCLairVDjDB2w/mV4iyF1N/1WfTIvYOt51SPafaXKGYG2gBW6U5kZou90HXExoRu BK/w== X-Gm-Message-State: AOJu0YwkIYDVO6LqSxCZC7hLh1ttG490SSQ11PPZ6Zms1Zg8HIoWTbZS rb9YS36xTscrv+XTOSnFZ2O1PiTHOO5GiU1ZhHTbWUSQo+dOkJ8tiO1zMOMQMBb6xQAEcfFxGen XsXlMoomQsyxfJ7UPWl7e9yq26V8fK4K/lXapxyno X-Received: by 2002:a05:6870:5ba7:b0:254:bd24:de83 with SMTP id 586e51a60fabf-25e2b8cee7amr3116736fac.12.1720157159264; Thu, 04 Jul 2024 22:25:59 -0700 (PDT) Received: from wsx-cc1-001.. (c-76-136-218-80.hsd1.il.comcast.net. [76.136.218.80]) by smtp-relay.gmail.com with ESMTPS id 586e51a60fabf-25e45059c6bsm33887fac.2.2024.07.04.22.25.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Jul 2024 22:25:59 -0700 (PDT) X-Relaying-Domain: proxyid.net From: Marth64 To: ffmpeg-devel@ffmpeg.org Date: Fri, 5 Jul 2024 00:25:51 -0500 Message-Id: <20240705052555.402920-2-marth64@proxyid.net> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240705052555.402920-1-marth64@proxyid.net> References: <20240705052555.402920-1-marth64@proxyid.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/5] avformat/demux: Copy AVCodecContext properties in codec_close() 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 Cc: Marth64 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 89pHsze+qZfs After avformat_find_stream_info() calls codec_close(), the properties are not copied in the newly created skeleton context returned by codec_close(). This breaks display of the properties when viewing stream information afterward e.g. via av_dump_format(). Copy the old properties over, thus fixing printing of the properties (such as Closed Captions) in av_dump_format() that broke sometime after 4.4.2. Signed-off-by: Marth64 --- libavformat/demux.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavformat/demux.c b/libavformat/demux.c index dc65f9ad91..72d4ae7593 100644 --- a/libavformat/demux.c +++ b/libavformat/demux.c @@ -1298,6 +1298,7 @@ static int codec_close(FFStream *sti) if (ret < 0) goto fail; + avctx_new->properties = sti->avctx->properties; avctx_new->pkt_timebase = sti->avctx->pkt_timebase; #if FF_API_TICKS_PER_FRAME