aboutsummaryrefslogtreecommitdiffstats
path: root/libavfilter
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2022-09-02 16:06:08 +0200
committerAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2022-09-14 21:48:11 +0200
commitf4af504a1ff2561c9980a61ec2394841f35911df (patch)
tree81aa167618ad3d15bdf18653e034ec6bb0964f91 /libavfilter
parent8357d4790fd0f11d7b76e20d321ec8241d80bd05 (diff)
downloadffmpeg-f4af504a1ff2561c9980a61ec2394841f35911df.tar.gz
avfilter/avfilter: Don't use AVFrame.channel_layout
Reviewed-by: Nicolas George <george@nsup.org> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Diffstat (limited to 'libavfilter')
-rw-r--r--libavfilter/avfilter.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index 965f5d0f63..bde41637dd 100644
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@ -21,6 +21,7 @@
#include "libavutil/avassert.h"
#include "libavutil/avstring.h"
+#include "libavutil/bprint.h"
#include "libavutil/buffer.h"
#include "libavutil/channel_layout.h"
#include "libavutil/common.h"
@@ -45,6 +46,7 @@
static void tlog_ref(void *ctx, AVFrame *ref, int end)
{
+#ifdef TRACE
ff_tlog(ctx,
"ref[%p buf:%p data:%p linesize[%d, %d, %d, %d] pts:%"PRId64" pos:%"PRId64,
ref, ref->buf, ref->data[0],
@@ -61,13 +63,19 @@ static void tlog_ref(void *ctx, AVFrame *ref, int end)
av_get_picture_type_char(ref->pict_type));
}
if (ref->nb_samples) {
- ff_tlog(ctx, " cl:%"PRId64"d n:%d r:%d",
- ref->channel_layout,
+ AVBPrint bprint;
+
+ av_bprint_init(&bprint, 1, AV_BPRINT_SIZE_UNLIMITED);
+ av_channel_layout_describe_bprint(&ref->ch_layout, &bprint);
+ ff_tlog(ctx, " cl:%s n:%d r:%d",
+ bprint.str,
ref->nb_samples,
ref->sample_rate);
+ av_bprint_finalize(&bprint, NULL);
}
ff_tlog(ctx, "]%s", end ? "\n" : "");
+#endif
}
void ff_command_queue_pop(AVFilterContext *filter)