From patchwork Sat Aug 10 12:47:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Eugen Hoyos X-Patchwork-Id: 14371 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 A6753448EDD for ; Sat, 10 Aug 2019 15:47:49 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7244868AAF0; Sat, 10 Aug 2019 15:47:49 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ot1-f44.google.com (mail-ot1-f44.google.com [209.85.210.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D800B68A1C3 for ; Sat, 10 Aug 2019 15:47:42 +0300 (EEST) Received: by mail-ot1-f44.google.com with SMTP id l15so143151368otn.9 for ; Sat, 10 Aug 2019 05:47:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=rtktVp5TXsEsIq8s2AQ8lwoytbxAYgsDm/VbEwbtJbQ=; b=GQKOU+gqxooYZ1+kbUCUL/e9383S8c7zQwKOJqYF54JMsvrR3jiqf1cO5LhM1jayRF v+ZkYW8Rz0h5NfMV8vcBJXL2uGpZCTg/cfBtvPm+3XXBGA80r5MVz+6AerWR3LkwpHo3 U8LjVJO9b6W6mgRd9uuZPPKtg4lqfc7xtfaBQc7YOeogKQc21c/72o3pLpoj/lx1wKM4 46Uf6d07ccckidl4Qu6K/cErG877ZPqDC7CmSuk8iz+N4pkj5w8xyvQKhc8eD0whK8Fi JLPriL8LRqfVWnI3DGlIGnZ0a8k00hpu1+fxOtwmCtuH2NrKxWcHweYfHQo362udyJSH zrfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=rtktVp5TXsEsIq8s2AQ8lwoytbxAYgsDm/VbEwbtJbQ=; b=ay05DiKvR9ZL1k5ZTvDBHKzkL5MEyxUADftGAtCy4jKkxfgU6G/pmPKzbY5OzMZWMJ 291kAlFxbd+eZGpXjppjLh2G+gdAZq9dc3gztZ/HTy9npDE1X+P6BZ7aw4F2PrzFDwtT YXBC4ED/ky+/VwRaOnzAJkyMEjOoDwy8Ci802YtyZ+8XwPTY+k0Jsu/ZEJSzASZHCYzt SGAwYqdfAYu1u4mUr2vpLQN5Ms9jCy+Y1RnkKoObVCrx5LtLFLjAc3iQP9VyWlNYs4VN gJTsHy5Nf6dGavm8dRkRzeFDTo3JLGibXZNjdd+tWKn2lakzGVXLQZefSoL/+Ue1l3Y9 rkAQ== X-Gm-Message-State: APjAAAUxWspmqAFl2sPL7iEn5JwLCUYi5Sqljdt4Mca2n3NOy6E3qI9W yT7RB/w/yB3wlEvKc3SKwi30CuKb8nLjl81SCWzOhfYx X-Google-Smtp-Source: APXvYqw2b66ZPGXUZ2rCXBZeOlYN9vm6dcp+CJ7lUFKYjy6xJMLB7JwvNE14IoESIXGm+UQGP6bPu1NLEaHbwVCOK90= X-Received: by 2002:a6b:b602:: with SMTP id g2mr25388998iof.54.1565441261557; Sat, 10 Aug 2019 05:47:41 -0700 (PDT) MIME-Version: 1.0 From: Carl Eugen Hoyos Date: Sat, 10 Aug 2019 14:47:30 +0200 Message-ID: To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH]lavf/dump: Fix cpb bitrate types after next major bump 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Hi! Attached patch fixes a compilation warning when compiling without FF_API_UNSANITIZED_BITRATES. Please comment, Carl Eugen From 48f7c57037206fe734bd45dc12c6140220afe34f Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Sat, 10 Aug 2019 14:43:58 +0200 Subject: [PATCH] lavf/dump: Fix cpb bitrate type after next major bump. --- libavformat/dump.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavformat/dump.c b/libavformat/dump.c index 1c44656071..126641259d 100644 --- a/libavformat/dump.c +++ b/libavformat/dump.c @@ -320,7 +320,11 @@ static void dump_cpb(void *ctx, AVPacketSideData *sd) } av_log(ctx, AV_LOG_INFO, +#if FF_API_UNSANITIZED_BITRATES "bitrate max/min/avg: %d/%d/%d buffer size: %d vbv_delay: %"PRId64, +#else + "bitrate max/min/avg: %"PRIu64"/%"PRIu64"/%"PRIu64" buffer size: %d vbv_delay: %"PRId64, +#endif cpb->max_bitrate, cpb->min_bitrate, cpb->avg_bitrate, cpb->buffer_size, cpb->vbv_delay); -- 2.22.0