diff mbox series

[FFmpeg-devel,2/5] ffprobe: do not use deprecated AVStream.codec for max bitrate

Message ID 20210208112828.27113-2-anton@khirnov.net
State Accepted
Commit cb789fd2b34864df30bc4b664cfee632dca0a1e4
Headers show
Series [FFmpeg-devel,1/5] ffprobe: remove an unnecessary deprecation guard | expand

Checks

Context Check Description
andriy/x86_make success Make finished
andriy/x86_make_fate success Make fate finished
andriy/PPC64_make success Make finished
andriy/PPC64_make_fate success Make fate finished

Commit Message

Anton Khirnov Feb. 8, 2021, 11:28 a.m. UTC 
Use the decoder context instead.
---
 fftools/ffprobe.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Comments

Paul B Mahol Feb. 8, 2021, 11:40 a.m. UTC | #1 
lgtm
diff mbox series

Patch

diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c
index 4e5beb5710..f7d042525e 100644
--- a/fftools/ffprobe.c
+++ b/fftools/ffprobe.c
@@ -2754,10 +2754,10 @@  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);