From patchwork Wed Mar 31 10:13:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tobias Rapp X-Patchwork-Id: 26670 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 51A7B44B591 for ; Wed, 31 Mar 2021 13:13:32 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 295586880C3; Wed, 31 Mar 2021 13:13:32 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from server6.ceeqoo.com (server6.ceeqoo.com [178.77.101.243]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0543F687EC8 for ; Wed, 31 Mar 2021 13:13:26 +0300 (EEST) Received: from mailix (www.noaport.de [109.90.164.154]) by server6.ceeqoo.com (Postfix) with ESMTPA id E9709BA005 for ; Wed, 31 Mar 2021 12:13:24 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=noa-archive.com; s=default; t=1617185605; bh=t6CE5Zt0urAx/iVLXqmA2p7/cpiWtE+TErQOsrDRq9M=; h=Received:From:To:Subject; b=L0RAx9/FA7U5R7JHniceL6p9bshq/OjRELweXRA3p8bqFXNwNpTf33/kFaEHQ/Xgf EulUGEyP1Ouwg98rvq9GDgzqAedUJe18+ltVmtZ0YQ6FZZlIWBM7BZcRPGxCY2vwho wbql5bw/hxC2oNGvg80QlmZMb2uSdyU5P6+1RDJY= Authentication-Results: server6.ceeqoo.com; spf=pass (sender IP is 109.90.164.154) smtp.mailfrom=t.rapp@noa-archive.com smtp.helo=mailix Received-SPF: pass (server6.ceeqoo.com: connection is authenticated) Received: from frogstar-a.kuhnle.local (frogstar-a.kuhnle.local [192.168.0.26]) by mailix with ESMTPA ; Wed, 31 Mar 2021 12:13:24 +0200 From: Tobias Rapp To: ffmpeg-devel@ffmpeg.org Date: Wed, 31 Mar 2021 12:13:23 +0200 Message-Id: <1617185604-18044-1-git-send-email-t.rapp@noa-archive.com> X-Mailer: git-send-email 2.7.4 X-PPP-Message-ID: <161718560526.20657.9691717984024403579@server6.ceeqoo.com> X-PPP-Vhost: noa-archive.com Subject: [FFmpeg-devel] [PATCH 1/2] fftools/ffprobe: Remove check on show_frames and show_packets in XML writer X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" The "packets_and_frames" element has been added to ffprobe.xsd in 0c9f0da0f7656059e9bd41931d250aafddf35ea3 but apparently removing the check in ffprobe.c has been forgotten. Signed-off-by: Tobias Rapp --- fftools/ffprobe.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c index 38462e1..1bfc144 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -1660,13 +1660,6 @@ static av_cold int xml_init(WriterContext *wctx) CHECK_COMPLIANCE(show_private_data, "private"); CHECK_COMPLIANCE(show_value_unit, "unit"); CHECK_COMPLIANCE(use_value_prefix, "prefix"); - - if (do_show_frames && do_show_packets) { - av_log(wctx, AV_LOG_ERROR, - "Interleaved frames and packets are not allowed in XSD. " - "Select only one between the -show_frames and the -show_packets options.\n"); - return AVERROR(EINVAL); - } } return 0; From patchwork Wed Mar 31 10:13:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tobias Rapp X-Patchwork-Id: 26671 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 8761544B591 for ; Wed, 31 Mar 2021 13:13:33 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6B0F5689A8B; Wed, 31 Mar 2021 13:13:33 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from server6.ceeqoo.com (server6.ceeqoo.com [178.77.101.243]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 07A29687F5A for ; Wed, 31 Mar 2021 13:13:26 +0300 (EEST) Received: from mailix (www.noaport.de [109.90.164.154]) by server6.ceeqoo.com (Postfix) with ESMTPA id E7885B9FFA for ; Wed, 31 Mar 2021 12:13:24 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=noa-archive.com; s=default; t=1617185605; bh=BPK632rpRJEWbIDHMnRMvTo2CS5yCJKG0IFoJ0vfSnI=; h=Received:From:To:Subject; b=NZ8lWwn3TF2dPYkZ/XR0fuV66+yY6q34YrvJuSv/x5TEwQPey6MqWQwBd8yg4M1VE Nho7mU3jopBwu6LOAvmGyecRQK1KCknYz7kxe4oJ0v/rOOQu7gMd8HnV6s/xS/rck/ 3VmmFrIQrkjPjniupfDIhNquPgRV35sXJKlneRMk= Authentication-Results: server6.ceeqoo.com; spf=pass (sender IP is 109.90.164.154) smtp.mailfrom=t.rapp@noa-archive.com smtp.helo=mailix Received-SPF: pass (server6.ceeqoo.com: connection is authenticated) Received: from frogstar-a.kuhnle.local (frogstar-a.kuhnle.local [192.168.0.26]) by mailix with ESMTPA ; Wed, 31 Mar 2021 12:13:24 +0200 From: Tobias Rapp To: ffmpeg-devel@ffmpeg.org Date: Wed, 31 Mar 2021 12:13:24 +0200 Message-Id: <1617185604-18044-2-git-send-email-t.rapp@noa-archive.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1617185604-18044-1-git-send-email-t.rapp@noa-archive.com> References: <1617185604-18044-1-git-send-email-t.rapp@noa-archive.com> X-PPP-Message-ID: <161718560526.20656.8847050364477562188@server6.ceeqoo.com> X-PPP-Vhost: noa-archive.com Subject: [FFmpeg-devel] [PATCH 2/2] doc/ffprobe.xsd: Clean-up choice indicator definitions X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Remove the unneeded wrapping sequence element. Also the minOccurs/maxOccurs occurrence inicators on the inner element definitions can be removed. Signed-off-by: Tobias Rapp --- doc/ffprobe.xsd | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/doc/ffprobe.xsd b/doc/ffprobe.xsd index a9ffe57..250de8c 100644 --- a/doc/ffprobe.xsd +++ b/doc/ffprobe.xsd @@ -29,22 +29,18 @@ - - - - - - + + + + - - - - - - - + + + + +