X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavfilter%2Faf_ashowinfo.c;h=7e7543f672ccc1c0167bf8327686ea64b245e92b;hb=402ac72bbc8fcbcce7aa385873c14cf8e0384ca4;hp=8e4f30159f47940700469e474ded7407271f0254;hpb=4d60e5051e66c6e79645efec1376b98caf41ad03;p=ffmpeg

diff --git a/libavfilter/af_ashowinfo.c b/libavfilter/af_ashowinfo.c
index 8e4f30159f4..7e7543f672c 100644
--- a/libavfilter/af_ashowinfo.c
+++ b/libavfilter/af_ashowinfo.c
@@ -35,6 +35,7 @@
 
 #include "audio.h"
 #include "avfilter.h"
+#include "internal.h"
 
 typedef struct AShowInfoContext {
     /**
@@ -54,7 +55,7 @@ static void uninit(AVFilterContext *ctx)
     av_freep(&s->plane_checksums);
 }
 
-static int filter_samples(AVFilterLink *inlink, AVFilterBufferRef *buf)
+static int filter_frame(AVFilterLink *inlink, AVFilterBufferRef *buf)
 {
     AVFilterContext *ctx = inlink->dst;
     AShowInfoContext *s  = ctx->priv;
@@ -85,12 +86,12 @@ static int filter_samples(AVFilterLink *inlink, AVFilterBufferRef *buf)
 
     av_log(ctx, AV_LOG_INFO,
            "n:%"PRIu64" pts:%s pts_time:%s pos:%"PRId64" "
-           "fmt:%s chlayout:%s rate:%d nb_samples:%d "
+           "fmt:%s channels:%d chlayout:%s rate:%d nb_samples:%d "
            "checksum:%08X ",
            s->frame,
            av_ts2str(buf->pts), av_ts2timestr(buf->pts, &inlink->time_base),
            buf->pos,
-           av_get_sample_fmt_name(buf->format), chlayout_str,
+           av_get_sample_fmt_name(buf->format), buf->audio->channels, chlayout_str,
            buf->audio->sample_rate, buf->audio->nb_samples,
            checksum);
 
@@ -100,7 +101,7 @@ static int filter_samples(AVFilterLink *inlink, AVFilterBufferRef *buf)
     av_log(ctx, AV_LOG_INFO, "]\n");
 
     s->frame++;
-    return ff_filter_samples(inlink->dst->outputs[0], buf);
+    return ff_filter_frame(inlink->dst->outputs[0], buf);
 }
 
 static const AVFilterPad inputs[] = {
@@ -108,7 +109,7 @@ static const AVFilterPad inputs[] = {
         .name       = "default",
         .type             = AVMEDIA_TYPE_AUDIO,
         .get_audio_buffer = ff_null_get_audio_buffer,
-        .filter_samples   = filter_samples,
+        .filter_frame     = filter_frame,
         .min_perms        = AV_PERM_READ,
     },
     { NULL },