From patchwork Wed Nov 21 01:01:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 11099 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 B279044CDA3 for ; Wed, 21 Nov 2018 03:02:07 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3A42D689E38; Wed, 21 Nov 2018 03:02:08 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f194.google.com (mail-pl1-f194.google.com [209.85.214.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A0B95689A7B for ; Wed, 21 Nov 2018 03:02:01 +0200 (EET) Received: by mail-pl1-f194.google.com with SMTP id u6so2849802plm.8 for ; Tue, 20 Nov 2018 17:02:03 -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=xQww4ZX/p4nQb8NvTB6waATn4bjuTxF9ENfYQFG2LHk=; b=Ey6qikXF8r3jbvG08B1O8uN/VbzNNa1IHcPvjOxnPLZ5NQK6N3rTJyu3ssl7HXR4ts l7KNVgMAJYDFkwOxo43btJkloKZhpPZPxBldsOE2CgF9IQ3kaq5FnRvJWK6HO+ajPwXG ZF04Go9eKvybXbq3rpxvdRfVeAYXqV1fC1dBd7kBvKmSCLSNQdSv6r9WgNzJN/zq9zgN 7XsJtlDyPO+GDJA1YzCg0dKgbJY7XZU4LNnpmfWqOZ0sht2QgySrx9OfwErj0eeY8tGV wIddzVkTocyBqtx+McmhVPSrKE3S7kk1j2q6DpUAVtn1EdYwNDi6FSe5TaX7zyi3FFSf ZGFA== 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=xQww4ZX/p4nQb8NvTB6waATn4bjuTxF9ENfYQFG2LHk=; b=WhjMG0kmlqsWhSs+5CpL+/Xg+igBEvwH+f1ELb8mKTlKw5Zij23SiUTc6tV0a9VhrH ckH8VTYp5sSacfnjEeOZzY3cf3j9qC66lh9GjEfoAmGM78UbzAkxAy2tUZ/N5CIBDamq gdElNaeZrjrgzLKj+65xyE72Wm3kne6IrK5kHKGFQ4hMd4ZPBOnrrs/LCxabdpRM/eCu A3SNsqhniot3yJ6zmSAOMezw5OxVaXLAgz8L/Mt0IeylSND9bN/w9HwWuIOHnR72K+s+ 74HTT3o4juTkJnqqq4jqNQ4wLTi8V6reGxxvOIuJRQZHv4lsRYPDqFcHnNbZn5t9oBwG eClA== X-Gm-Message-State: AA+aEWbaRnQNCvbNDzsHNpBYgWptEZ1oXtwmfZV6TWZVthqRCpKPBNMP rXc9W43yPgVM2giQ2wCJ5/oQ67St X-Google-Smtp-Source: AFSGD/VELxsiF5UkYyB/Zvn1IVI494mTHerlIH0dPotZ1sxGCXX8ngF1ekOXSk8LUVOUhrTrkpIgZA== X-Received: by 2002:a17:902:3225:: with SMTP id y34-v6mr4445744plb.227.1542762122038; Tue, 20 Nov 2018 17:02:02 -0800 (PST) Received: from localhost.localdomain ([47.90.47.25]) by smtp.gmail.com with ESMTPSA id l87sm30576339pfj.179.2018.11.20.17.02.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 20 Nov 2018 17:02:01 -0800 (PST) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Wed, 21 Nov 2018 09:01:41 +0800 Message-Id: <1542762104-15897-3-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1542762104-15897-1-git-send-email-mypopydev@gmail.com> References: <1542762104-15897-1-git-send-email-mypopydev@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH V2 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]" Reviewed-by: Moritz Barsnick 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..ab0dbff 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 && 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);