Signed-off-by: James Almer <jamr...@gmail.com>
---
fftools/ffprobe.c | 19 ++++++++-----------
1 file changed, 8 insertions(+), 11 deletions(-)
diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c
index 0711e02922..52d3d26962 100644
--- a/fftools/ffprobe.c
+++ b/fftools/ffprobe.c
@@ -2295,12 +2295,10 @@ static void show_frame(WriterContext *w, AVFrame
*frame, AVStream *stream,
if (s) print_str ("sample_fmt", s);
else print_str_opt("sample_fmt", "unknown");
print_int("nb_samples", frame->nb_samples);
- print_int("channels", frame->channels);
- if (frame->channel_layout) {
- av_bprint_clear(&pbuf);
- av_bprint_channel_layout(&pbuf, frame->channels,
- frame->channel_layout);
- print_str ("channel_layout", pbuf.str);
+ print_int("channels", frame->ch_layout.nb_channels);
+ if (frame->ch_layout.order != AV_CHANNEL_ORDER_UNSPEC) {
+ av_channel_layout_describe(&frame->ch_layout, val_str,
sizeof(val_str));
+ print_str ("channel_layout", val_str);
} else
print_str_opt("channel_layout", "unknown");
break;
@@ -2704,12 +2702,11 @@ static int show_stream(WriterContext *w,
AVFormatContext *fmt_ctx, int stream_id
if (s) print_str ("sample_fmt", s);
else print_str_opt("sample_fmt", "unknown");
print_val("sample_rate", par->sample_rate, unit_hertz_str);
- print_int("channels", par->channels);
+ print_int("channels", par->ch_layout.nb_channels);
- if (par->channel_layout) {
- av_bprint_clear(&pbuf);
- av_bprint_channel_layout(&pbuf, par->channels,
par->channel_layout);
- print_str ("channel_layout", pbuf.str);
+ if (par->ch_layout.order != AV_CHANNEL_ORDER_UNSPEC) {
+ av_channel_layout_describe(&par->ch_layout, val_str,
sizeof(val_str));
+ print_str ("channel_layout", val_str);
} else {
print_str_opt("channel_layout", "unknown");
}
--
2.34.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
