Skip to content

F
ffmpeg
Commit b5ecfa1d authored by Anton Khirnov's avatar Anton Khirnov Committed by Michael Niedermayer
Browse files
Options

buffersink: switch to filter_frame 

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 5d796270
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 4 deletions
libavfilter/buffersink.c
View file @ b5ecfa1d
...@@ -48,13 +48,12 @@ static av_cold void uninit(AVFilterContext *ctx) ...@@ -48,13 +48,12 @@ static av_cold void uninit(AVFilterContext *ctx)
av_audio_fifo_free(sink->audio_fifo); av_audio_fifo_free(sink->audio_fifo);
} }
static int start_frame(AVFilterLink *link, AVFilterBufferRef *buf) static int filter_frame(AVFilterLink *link, AVFilterBufferRef *buf)
{ {
BufferSinkContext *s = link->dst->priv; BufferSinkContext *s = link->dst->priv;
// av_assert0(!s->cur_buf); // av_assert0(!s->cur_buf);
s->cur_buf = buf; s->cur_buf = buf;
link->cur_buf = NULL;
return 0; return 0;
} }
...@@ -144,7 +143,7 @@ static const AVFilterPad avfilter_vsink_buffer_inputs[] = { ...@@ -144,7 +143,7 @@ static const AVFilterPad avfilter_vsink_buffer_inputs[] = {
{ {
.name = "default", .name = "default",
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.start_frame = start_frame, .filter_frame = filter_frame,
.min_perms = AV_PERM_READ, .min_perms = AV_PERM_READ,
.needs_fifo = 1 .needs_fifo = 1
}, },
...@@ -169,7 +168,7 @@ static const AVFilterPad avfilter_asink_abuffer_inputs[] = { ...@@ -169,7 +168,7 @@ static const AVFilterPad avfilter_asink_abuffer_inputs[] = {
{ {
.name = "default", .name = "default",
.type = AVMEDIA_TYPE_AUDIO, .type = AVMEDIA_TYPE_AUDIO,
.filter_frame = start_frame, .filter_frame = filter_frame,
.min_perms = AV_PERM_READ, .min_perms = AV_PERM_READ,
.needs_fifo = 1 .needs_fifo = 1
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment