From patchwork Sun Jun 12 19:48:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Hartland X-Patchwork-Id: 36185 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1a22:b0:84:42e0:ad30 with SMTP id cj34csp143294pzb; Sun, 12 Jun 2022 12:49:05 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzj3rlKA96QqkWpA4MXM2nSLKDdTwqWiNlcEjrXUD4TTVfY0s5KNqnOj1rk2zvAywatMnfn X-Received: by 2002:aa7:c604:0:b0:42d:cffb:f4dc with SMTP id h4-20020aa7c604000000b0042dcffbf4dcmr62974648edq.270.1655063345135; Sun, 12 Jun 2022 12:49:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655063345; cv=none; d=google.com; s=arc-20160816; b=pGfslb4/7KmseSbrHhLFdQt9Dc9KEpEUcFg7imm+ntzkZu+Op06fMZ+7ApceUeGbob zS5+18cuN+SEeyxhd3doa1iB1b2Iuis0NTSS/RnAKHj7HYeahj3XcFUBxQ6++FrDsKuc r195adLHc1N343AmtF/7FfSGyHyK/q6gfSo9E7PGtrqGoWJcrUbUnswQO56miTuzIEsl FhCD7TkrtBASV2N9ixdQL4R1gAWya1hc7xPzZjFBgrOoufAmCfKXaHk2ws6IJ/tLGozi t2RVVJz/5G/ry2tPa00UnuOkIYMNO1zWpI9tJCasa12dQ9+fhvNtQDzRIet0XhnAENJ0 e3wA== 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:to:message-id:date:from:mime-version :dkim-signature:delivered-to; bh=6bOJh0HOzlzrExz4KR7qw7E3xzEVZ+LcEEQyi1meidQ=; b=reoos3q3AcCrhyb5oeUPBkWg3xHC3lAZqnZOK6gltxnR550zqaACoekBt1vyKNDNZE e7Uai8YTZKLasQFvTqa3AKNTTkOSDxtb09W5a2R0vaMm6vXdx8OyV/AjJWp+nj9SJYe8 ipqlpFw3EhlheEwkpuuP1GpG7HQiPA9pc0Fm1HuIJnGCbWo6yCVkcumSWbuYe37NMk3L iP2YrUAsJ3ynuse8fv31OvywXggVzlpkPgS+mn6kligfgvhIdKyXuon2Hg3y1if07npb RZ46anAVtnSgJlnj4ZO+TLot5uftpu/R1uvz3DrtEvBmYFXX/4CzqricQwdnrK9tTGAd WStg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=EqLsA4Xy; 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 ji9-20020a170907980900b00715777cb7e3si5004565ejc.857.2022.06.12.12.49.04; Sun, 12 Jun 2022 12:49:05 -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=20210112 header.b=EqLsA4Xy; 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 0AB1868B571; Sun, 12 Jun 2022 22:49:01 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f48.google.com (mail-ej1-f48.google.com [209.85.218.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0D25368B308 for ; Sun, 12 Jun 2022 22:48:55 +0300 (EEST) Received: by mail-ej1-f48.google.com with SMTP id gl15so7415003ejb.4 for ; Sun, 12 Jun 2022 12:48:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:from:date:message-id:subject:to; bh=x4UYT8Wr+85WXJ0R8Ickk8vDaUGXZnDk3MKJaDr9xzY=; b=EqLsA4XydDsO118stbcZ7lwHHidJJLvq1ME4ZMCBJW/zA1AeaRUBiXRMi9LNAecGkr w6xUVG+i/5ZVaF4udjtvKlNouw71XOY0f9IKzaiwU7Q5q/C6QVEehVZ/EdqwOhtpQUk5 Q85Ond5+ViwGF/VkiLe1K2X0hqf3dU9khjtdMridmfP7voPbRGU3xorFkbhmbD2c8fbz /6FdnD9o2ObcIpc/TupwaTotm0jslNUhYtv/n0exoJ0wZJtMH2nkz6h7PeruslZ9T3GV pELUCbUYhH0DHxDtfJaygbUfyrhmVUAiK1+/MheGlM3Voe9VkQoaaOv7oqiCLTuYUtV+ wzmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=x4UYT8Wr+85WXJ0R8Ickk8vDaUGXZnDk3MKJaDr9xzY=; b=2Ig0CiMENtQgrRgpX6i9KvIQ7LCbhsTaxdLMTQQ0yofCpL+NadOcK1aoDJjun7tWd4 VCgwPLz/e/8qehG4J6BZ1FLGaYbkMH5yMTJ5YbbhhTEDArs+tDE9QA7SCAzFNakU6sy5 qFrLAM1ERHpT55lFAOU2Kvx+gNndGE39XECNwITmnx/ZLXQcsaXMwY9BlgnB2AzDkYGZ n3LImBZ1obpLLUjJdgWdnB7OPfu8Gvx+4NLZcLpBeHi76kTfA9osr2DUJXUtjr7HNJrP TTEEudeW9dA54BZq80mtqVTUQSammOqC6wsvYZ6rmAYSwMZSfTwHjiZ8Q/utNtonhf+g lSYA== X-Gm-Message-State: AOAM532vk5Ix0hiPdOMgVcmQCGKfKPasosF86JybrKFO6+s5voxc1cpP 9xIxvytccryXzaK1QFWgbAf/3VxGgPEIH2o89HRU6zqNGwM= X-Received: by 2002:a17:906:3f02:b0:718:bdf7:790d with SMTP id c2-20020a1709063f0200b00718bdf7790dmr1941844ejj.479.1655063334320; Sun, 12 Jun 2022 12:48:54 -0700 (PDT) MIME-Version: 1.0 From: Steven Hartland Date: Sun, 12 Jun 2022 20:48:43 +0100 Message-ID: To: ffmpeg-devel@ffmpeg.org X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: [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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: vC63xbPnOH2u Remove return after copying extradata as this prevents metadata being duplicated correctly. 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(-) -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 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