From patchwork Thu Apr 21 07:01:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Sabatini X-Patchwork-Id: 35367 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b9e:b0:7d:cfb5:dc7c with SMTP id b30csp66113pzh; Thu, 21 Apr 2022 00:01:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzlDIBGC6ISpL99CTJrV5jk2IhR21kAY3Qr/DFB2PNYefeJg1por8oPwqncIHoZl6QwwZn4 X-Received: by 2002:a17:907:6ea4:b0:6e8:8f2e:e29c with SMTP id sh36-20020a1709076ea400b006e88f2ee29cmr21296431ejc.225.1650524486867; Thu, 21 Apr 2022 00:01:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1650524486; cv=none; d=google.com; s=arc-20160816; b=BbX99ZIL02mWEmpgnWw4KWGwAlwukcY9Zperkiqof3o44x1LYC1Zg28j8rFI2/PF+N f6DA3CfBs4kYqT/lBJYWxhG4o3rJsFAZZzDKziBbKknPH+5xVifjHsUDSMEjkKxYJdC3 TqYtiIOkBPWxzLT7iGv78z830PjIbHr6QOFPbECWzQOzaXouMOU2Bj+MdZuD5XGL4jSb Hki6NJ6PwuaTCQE0i6GCbxuJoGrgLzbBsaBxkaGwsZQx/BWIa3ZPD+kpr21S+ZeUnl1H r1+fTGB9o2UpX0pqSOF7J7kJzHWsr8BQKhnLrvGOQpwL+ozixDzDkW8ISPsIlHAvAfAh e7Kg== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=R0MSLpwtE3nsQ7twkRSSn/TwC0l1s4XG2/fWJfUTnds=; b=1C4wLk0nZgNqJVGRHUZZjR+PrKq7I32un/KsozBvbqkLe2od4/84pcg3QyppOwJbFm qItFWWIrhRLyxvCnHsWufBiwo3Lw+5mZegILfaANc8IWp2c3Iw0GsL4SGORlpxlHUt2D Cy6bFKeU/U/1Mp4i7QBVaYD2Dul6PDq2XQTaPia8HZ8IQ//fsMWF/ZDG2A9JqeEKqszr 1INMWzz51nM132GVlsILtX2Y0sfrRZ1Anc4WVONPJkrfOzfdl5LlpJ3zD3BoJtOhYEgP 9vNfkocvIOVCT0cugM5SEPoGkixGKEeF93StKtS1sgPWLK1TEvl0PGrAyAD1J7UKxn2g 1xSw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=JaSzAMYp; 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 k16-20020a17090627d000b006df8b578025si3539884ejc.876.2022.04.21.00.01.25; Thu, 21 Apr 2022 00:01:26 -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=JaSzAMYp; 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 1B39868B42B; Thu, 21 Apr 2022 10:01:22 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f53.google.com (mail-ed1-f53.google.com [209.85.208.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 656AA68B41E for ; Thu, 21 Apr 2022 10:01:16 +0300 (EEST) Received: by mail-ed1-f53.google.com with SMTP id d6so157939ede.8 for ; Thu, 21 Apr 2022 00:01:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=dA2ryp65lW+8ADCNlbcKyva1zHUUh2DlAsAmHwZdUP8=; b=JaSzAMYpQAU9fPp7DudTTQYI287WP3FjRlwOId0NChRe5RYiXxfNlnTczDsLhWqzqN Adj9DC/sZBHoKa5wUDZaNvR207I5AyOdb6YyK31RvCjzB9I/uvGX/nGv4DPoqzcnG2uG nN4KIa3LvjhB1EAnes94iV8+9hxxerBTAfC2f8GqqFXzaQA5A8CLSD1MHnAbLtF07Lt2 jd3cqfkhl2EyOdGPY6cr5rMWH8REnu0doalBHlsH5H0J/zQ1+kLrWsCoqsKxClypRwD2 9WRj5bcz7onU5gHsThxu4hBksiC7qriZ+swZcY/DOXfuOGmgRXF7rCSO13jQnDqngOl8 lN7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=dA2ryp65lW+8ADCNlbcKyva1zHUUh2DlAsAmHwZdUP8=; b=6/3V2IFNQgfFjpkYfqUUGGSgyC1JOy1rTR0PsBMej1hmqkwI2p4xFljEgwIzAW5jh+ P1zNDeOX1adnOCyZm6i+Z7GhTy+nYJxgg9gTf4v+PArTzzEK8/ngZDuHCbNwKBbp+V2r 2q5qCpl5tFWe+OcId1YT/O0tP65xhH/XhtmH7dfAS1p5233wVRYnTqwXlDsIKE+b2xU6 2vK8jZhNiWSmB+uJG6Ml6YawXJrAW15xBVBHJ3TKatHZlAwDZihRLyMXxSUvkRqejBN4 u7tfmNR9QghJBezr6R30XM7GFct/s6HKkPEmoxL9JRcHDHq+QSunuyM4o92hoj4edtOt 1VuA== X-Gm-Message-State: AOAM533bWSl6hI7YR6R03pC71ZLKU5si8S5jTn73MzwCqe6WdZG35wSW ftnVDJhNh2EFFc+zHsEYeOEF6+jza21iTg== X-Received: by 2002:aa7:d394:0:b0:41d:799e:e5ed with SMTP id x20-20020aa7d394000000b0041d799ee5edmr27721800edq.347.1650524475555; Thu, 21 Apr 2022 00:01:15 -0700 (PDT) Received: from mariano (dynamic-adsl-78-14-80-42.clienti.tiscali.it. [78.14.80.42]) by smtp.gmail.com with ESMTPSA id g15-20020a170906520f00b006cd07ba40absm7460990ejm.160.2022.04.21.00.01.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Apr 2022 00:01:15 -0700 (PDT) Received: by mariano (Postfix, from userid 1000) id 1338DBFA57; Thu, 21 Apr 2022 09:01:14 +0200 (CEST) From: Stefano Sabatini To: FFmpeg development discussions and patches Date: Thu, 21 Apr 2022 09:01:14 +0200 Message-Id: <20220421070114.167191-1-stefasab@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] ffprobe: update entry index after printing packet/media type 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: Stefano Sabatini Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: GgkasGpysNDY Fix JSON output in case a frame or packet section contains a nested section. Fix trac issue http://trac.ffmpeg.org/ticket/8680. --- fftools/ffprobe.c | 1 + 1 file changed, 1 insertion(+) diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c index 05c167eeb5..803c1b07df 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -1566,6 +1566,7 @@ static void json_print_section_header(WriterContext *wctx) if (!json->compact) JSON_INDENT(); printf("\"type\": \"%s\"", section->name); + wctx->nb_item[wctx->level]++; } } av_bprint_finalize(&buf, NULL);