From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 897A5430A4 for ; Sun, 19 Jun 2022 20:18:55 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DBE9F68B43B; Sun, 19 Jun 2022 23:18:52 +0300 (EEST) Received: from iq.passwd.hu (iq.passwd.hu [217.27.212.140]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CEF1268B2F5 for ; Sun, 19 Jun 2022 23:18:46 +0300 (EEST) Received: from localhost (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id 1FFC2E7376 for ; Sun, 19 Jun 2022 22:18:47 +0200 (CEST) X-Virus-Scanned: amavisd-new at passwd.hu Received: from iq.passwd.hu ([127.0.0.1]) by localhost (iq.passwd.hu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id SUprektSUa-B for ; Sun, 19 Jun 2022 22:18:45 +0200 (CEST) Received: from iq (iq [217.27.212.140]) by iq.passwd.hu (Postfix) with ESMTPS id E8D43E7228 for ; Sun, 19 Jun 2022 22:18:44 +0200 (CEST) Date: Sun, 19 Jun 2022 22:18:44 +0200 (CEST) From: Marton Balint To: FFmpeg development discussions and patches In-Reply-To: Message-ID: <26b9554f-38d0-af5e-a124-8848f57f25b3@passwd.hu> References: MIME-Version: 1.0 Subject: Re: [FFmpeg-devel] [PATCH] avformat/concat: fix missing metadata 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 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On Sun, 12 Jun 2022, Steven Hartland wrote: > Remove return after copying extradata as this prevents metadata > being duplicated correctly. The return there originated from commit b24d6c53037aaaa20fbd59cbd25c392229450660 and seems very much intentional to not overwrite stream parameters after every packet. So what is the issue you are trying to fix? Some parameters change after the avformat_find_stream_info() returned? Regards, Marton > > Signed-off-by: Steven Hartland > --- > libavformat/concatdec.c | 1 - > tests/ref/fate/concat-demuxer-simple2-lavf-ts | 2 +- > 2 files changed, 1 insertion(+), 2 deletions(-) > > diff --git a/libavformat/concatdec.c b/libavformat/concatdec.c > index e57da59e04..11ed2bd4c3 100644 > --- a/libavformat/concatdec.c > +++ b/libavformat/concatdec.c > @@ -182,7 +182,6 @@ static int copy_stream_props(AVStream *st, AVStream > *source_st) > } > memcpy(st->codecpar->extradata, source_st->codecpar->extradata, > source_st->codecpar->extradata_size); > - return 0; > } > if ((ret = avcodec_parameters_copy(st->codecpar, source_st->codecpar)) > < 0) > return ret; > diff --git a/tests/ref/fate/concat-demuxer-simple2-lavf-ts > b/tests/ref/fate/concat-demuxer-simple2-lavf-ts > index 9603ca21d0..d98e8b71e1 100644 > --- a/tests/ref/fate/concat-demuxer-simple2-lavf-ts > +++ b/tests/ref/fate/concat-demuxer-simple2-lavf-ts > @@ -211,5 +211,5 @@ > video|1|171982|1.910911|168382|1.870911|3600|0.040000|17440|206988|__|MPEGTS > Str > > video|1|175582|1.950911|171982|1.910911|3600|0.040000|15019|224848|__|MPEGTS > Stream ID|224 > > -0|mp2|unknown|audio|[3][0][0][0]|0x0003|s16p|44100|1|mono|0|N/A|0/0|0/0|1/90000|0|0.000000|N/A|N/A|64000|N/A|N/A|N/A|N/A|89|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|this > is stream 0 > +0|mp2|unknown|audio|[3][0][0][0]|0x0003|fltp|44100|1|mono|0|N/A|0/0|0/0|1/90000|0|0.000000|N/A|N/A|64000|N/A|N/A|N/A|N/A|89|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|this > is stream 0 > 1|mpeg2video|4|video|[2][0][0][0]|0x0002|352|288|0|0|0|0|1|1:1|11:9|yuv420p|8|tv|unknown|unknown|unknown|left|progressive|1|N/A|25/1|25/1|1/90000|N/A|N/A|N/A|N/A|N/A|N/A|N/A|N/A|N/A|60|22|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|this > is stream 1|CPB properties|0|0|0|49152|-1 > -- > 2.25.1 > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". > _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".