summaryrefslogtreecommitdiff
path: root/libavfilter/fifo.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-11-28 13:53:48 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-11-28 16:43:34 +0100
commitcd7febd33f20b42aac14cf9cb87efdf619b39b0a (patch)
tree6826129a1f327836e1c980449b2fa7308307b615 /libavfilter/fifo.c
parent16af29a7a6deff3f6081fca1e36ad96cf8fec77d (diff)
lavfi: replace filter_samples by filter_frame
Based on patch by Anton Khirnov Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/fifo.c')
-rw-r--r--libavfilter/fifo.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libavfilter/fifo.c b/libavfilter/fifo.c
index 8284ef087a..e995f37a94 100644
--- a/libavfilter/fifo.c
+++ b/libavfilter/fifo.c
@@ -228,7 +228,7 @@ static int return_audio_frame(AVFilterContext *ctx)
buf_out = s->buf_out;
s->buf_out = NULL;
}
- return ff_filter_samples(link, buf_out);
+ return ff_filter_frame(link, buf_out);
}
static int request_frame(AVFilterLink *outlink)
@@ -257,7 +257,7 @@ static int request_frame(AVFilterLink *outlink)
if (outlink->request_samples) {
return return_audio_frame(outlink->src);
} else {
- ret = ff_filter_samples(outlink, fifo->root.next->buf);
+ ret = ff_filter_frame(outlink, fifo->root.next->buf);
queue_pop(fifo);
}
break;
@@ -308,7 +308,7 @@ static const AVFilterPad avfilter_af_afifo_inputs[] = {
.name = "default",
.type = AVMEDIA_TYPE_AUDIO,
.get_audio_buffer = ff_null_get_audio_buffer,
- .filter_samples = add_to_queue,
+ .filter_frame = add_to_queue,
.min_perms = AV_PERM_PRESERVE,
},
{ NULL }