From patchwork Sat Mar 25 19:04:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 3098 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.50.79 with SMTP id y76csp598996vsy; Sat, 25 Mar 2017 12:05:25 -0700 (PDT) X-Received: by 10.223.150.70 with SMTP id c6mr2322142wra.85.1490468725201; Sat, 25 Mar 2017 12:05:25 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id c197si7865879wmc.40.2017.03.25.12.05.24; Sat, 25 Mar 2017 12:05:25 -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; 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=NONE 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 EB4CB688340; Sat, 25 Mar 2017 21:04:54 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk0-f195.google.com (mail-qk0-f195.google.com [209.85.220.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7B5E66882DE for ; Sat, 25 Mar 2017 21:04:47 +0200 (EET) Received: by mail-qk0-f195.google.com with SMTP id p22so2856061qka.0 for ; Sat, 25 Mar 2017 12:05:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=rgl/CaiLTNl4lIWKgfpstAcNXzxXp3j/16ftowD8GFY=; b=F81lLy24FzZC86xFvqIxs0PfmAqpk17nnfQNA1yNRjYVv4hfk3XidrHufWREImIEzE denuQtk/BgxupCiKlH7nY75uVja6aaqQPvIzYl2v30tbme7n0SuRERQaRK2QaTRv/s0f by8lqV1Q1/ciOd69AdGMxy854W7WRgEXxXvt1hVQegNyyAavtMS5+6YouFN2kHId7zAN xqs6byqUzn/3FRX0ytOGLr/G341O/TsqWqSKRMs37X2sYbIgOGcD8JCVNx1KotRLqTZK tHbfSPOD/abn/JUpg2iggNMt6suyoHgUPvKdT+yIqY2kW9/ag1kqoDjNMHOGd6lbMg60 vfCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=rgl/CaiLTNl4lIWKgfpstAcNXzxXp3j/16ftowD8GFY=; b=bqyJ0vNu9cBi2KnyW64lWFEaX5VXH9lKZSp22LUqkEUa7SXCiW933MQyV2EsrYVTql sZKDhxpoFdTi6+7ZcZyYQ1ME8xztl81eWLNPCSwMObxOHt4dFtT01cLIBZ5cFxZUbUAQ hi6SFN/BJlSIxlDm9FuuJ7bIuCB+jPdfmq8kQUst/4kNxHTwOks1jG+B5e93Rc/PSaSQ haF02GgM5TxYa2saacfj6gKeKC2YynW9IErbJPzkfc0mhJ3Nr3fGhGTPqaobFJf/1rBF CrSGAEGSGcbFouK2N6mqS2/ADcAq/dMfhc84lptoZSRBq5CE+I3QR/aP07dSiIUZElDW 5p/A== X-Gm-Message-State: AFeK/H2gBYNYxM5+EdzyeqUbiSdCBLjgVccHxggr882/MjyQHk1MbfIyX+1Ft4qFWbx8ew== X-Received: by 10.55.7.148 with SMTP id 142mr14136696qkh.181.1490468707406; Sat, 25 Mar 2017 12:05:07 -0700 (PDT) Received: from localhost.localdomain ([181.231.62.139]) by smtp.gmail.com with ESMTPSA id g48sm4261232qtb.51.2017.03.25.12.05.06 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 25 Mar 2017 12:05:07 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 25 Mar 2017 16:04:47 -0300 Message-Id: <20170325190447.3540-2-jamrial@gmail.com> X-Mailer: git-send-email 2.12.1 In-Reply-To: <20170325190447.3540-1-jamrial@gmail.com> References: <20170325190447.3540-1-jamrial@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/2] ffprobe: fix printing packet side data information 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" Signed-off-by: James Almer --- ffprobe.c | 4 ++-- tests/ref/fate/mov-aac-2048-priming | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ffprobe.c b/ffprobe.c index ba27bce823..dc69a89b78 100644 --- a/ffprobe.c +++ b/ffprobe.c @@ -1770,12 +1770,12 @@ static void print_pkt_side_data(WriterContext *w, { int i; - writer_print_section_header(w, SECTION_ID_STREAM_SIDE_DATA_LIST); + writer_print_section_header(w, id_data_list); for (i = 0; i < nb_side_data; i++) { const AVPacketSideData *sd = &side_data[i]; const char *name = av_packet_side_data_name(sd->type); - writer_print_section_header(w, SECTION_ID_STREAM_SIDE_DATA); + writer_print_section_header(w, id_data); print_str("side_data_type", name ? name : "unknown"); if (sd->type == AV_PKT_DATA_DISPLAYMATRIX && sd->size >= 9*4) { writer_print_integers(w, "displaymatrix", sd->data, 9, " %11d", 3, 4, 1); diff --git a/tests/ref/fate/mov-aac-2048-priming b/tests/ref/fate/mov-aac-2048-priming index 57e12f203d..2616944de3 100644 --- a/tests/ref/fate/mov-aac-2048-priming +++ b/tests/ref/fate/mov-aac-2048-priming @@ -1,4 +1,4 @@ -packet|codec_type=audio|stream_index=0|pts=-2048|pts_time=-0.046440|dts=-2048|dts_time=-0.046440|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=258|pos=36|flags=KDside_data| +packet|codec_type=audio|stream_index=0|pts=-2048|pts_time=-0.046440|dts=-2048|dts_time=-0.046440|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=258|pos=36|flags=KDside_data|side_data_type=Skip Samples|skip_samples=2048|discard_padding=0|skip_reason=0|discard_reason=0 packet|codec_type=audio|stream_index=0|pts=-1024|pts_time=-0.023220|dts=-1024|dts_time=-0.023220|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=258|pos=294|flags=KD packet|codec_type=audio|stream_index=0|pts=0|pts_time=0.000000|dts=0|dts_time=0.000000|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=146|pos=552|flags=K_