From patchwork Sun Nov 18 16:43:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 11069 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 BC95244E155 for ; Sun, 18 Nov 2018 18:43:37 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4359A689B9E; Sun, 18 Nov 2018 18:43:38 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f196.google.com (mail-pl1-f196.google.com [209.85.214.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 983B5680986 for ; Sun, 18 Nov 2018 18:43:31 +0200 (EET) Received: by mail-pl1-f196.google.com with SMTP id g59-v6so13397959plb.10 for ; Sun, 18 Nov 2018 08:43:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=19WeRmvVQwMulKTlEXyGE/WCaQXSH0lRE7st77Y1wHw=; b=ioWR2FIeimvpVWeum3aTUO6S5Ak9Ao9utu1TFoBqvQR3lT68EsUL94jRl9KRPcHusB Y5Z1GopRkDy+mHNPqNTUC6V4fnOd8pu8e+SfceBuTkDFujvMhMolpDer98XZZuBJiK5U Qv1pkzEh4ooJTiY5k4lQpX/Lly6P9bEYxGEhZaPXy7WT3dNbqmiKoPM9VVkmMUZx3jGq rCt/dJx/cx/lAmCAd40rk9FHSwYqOa3GhsGlYjs2BgCFFEe0MjFiA1ZAFpe2y8YNnQVP Gsk6zxAF/bcpJhgxrLnaGr4uuAIjFCjVLeBbnbz5aJb6lJsXrblEPRtA1qunjfPy3Pjq UE8A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=19WeRmvVQwMulKTlEXyGE/WCaQXSH0lRE7st77Y1wHw=; b=CMnOoSaSIiGunz6uW6I09vIIzSD8Me0EBDtlTRFngWi6vVDtz+NCMkpnH9MzOCvTqh RQKg89kiG49/QG0Qwf+SS7bcGgLU+vCN+YjPRIAco498c0g+B7hL3hzhlYJ77T+qg9Ut OKe2cGtv6hQv13pO/sWQvjZNo1jNdbWhYo+mzaByZxArPqR7KEx696/oydumpRPEL1Eq AIYAxQE33iXFa9euVPJa9UtGG54jTZKJRVFcxfnuv/1JlhM42t2QKyj6JOjbDv9KhsyD NkZ9l3Aor6bo41TtgQs+u+WAZl5mJG1QaPy1mJ0pq08BWh0Qx2rVki0Mk5EnQdo0QVrB XFxA== X-Gm-Message-State: AGRZ1gLufIWsYdTUggmi8ckTI9V+OUdhONQvkMtdE6AG9o/SFJDjr4Dt z+6G4SPGz7TwysvfAcptnBeCBp88 X-Google-Smtp-Source: AJdET5egKLBON9m7OIWjvASp2A2vcliU7oBJnw2jcAfFxLD6x4Ejl6RnAI54rM/jx1IVmxJiJta+fQ== X-Received: by 2002:a17:902:b611:: with SMTP id b17-v6mr19191347pls.31.1542559411045; Sun, 18 Nov 2018 08:43:31 -0800 (PST) Received: from localhost.localdomain ([47.90.47.25]) by smtp.gmail.com with ESMTPSA id 79sm36915215pge.66.2018.11.18.08.43.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 18 Nov 2018 08:43:30 -0800 (PST) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Nov 2018 00:43:11 +0800 Message-Id: <1542559394-3305-3-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1542559394-3305-1-git-send-email-mypopydev@gmail.com> References: <1542559394-3305-1-git-send-email-mypopydev@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/5] fftools/ffprobe: fix max_bit_rate dump. 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 Cc: Jun Zhao Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" ‘codec’ is deprecated in AVStream, so used the dec_ctx to dump max_bit_rate in ffprobe. Clean the warning like: "warning: ‘codec’ is deprecated [-Wdeprecated-declarations]" Signed-off-by: Jun Zhao --- fftools/ffprobe.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c index 544786e..280db78 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -2622,10 +2622,8 @@ static int show_stream(WriterContext *w, AVFormatContext *fmt_ctx, int stream_id print_time("duration", stream->duration, &stream->time_base); if (par->bit_rate > 0) print_val ("bit_rate", par->bit_rate, unit_bit_per_second_str); else print_str_opt("bit_rate", "N/A"); -#if FF_API_LAVF_AVCTX - if (stream->codec->rc_max_rate > 0) print_val ("max_bit_rate", stream->codec->rc_max_rate, unit_bit_per_second_str); - else print_str_opt("max_bit_rate", "N/A"); -#endif + if (dec_ctx->rc_max_rate > 0) print_val ("max_bit_rate", dec_ctx->rc_max_rate, unit_bit_per_second_str); + else print_str_opt("max_bit_rate", "N/A"); if (dec_ctx && dec_ctx->bits_per_raw_sample > 0) print_fmt("bits_per_raw_sample", "%d", dec_ctx->bits_per_raw_sample); else print_str_opt("bits_per_raw_sample", "N/A"); if (stream->nb_frames) print_fmt ("nb_frames", "%"PRId64, stream->nb_frames);