diff options
| author | Anton Khirnov <anton@khirnov.net> | 2012-11-27 07:49:45 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2012-11-28 08:50:19 +0100 |
| commit | 565e4993c63f797e2d50ad2f1e8f62fdbe299666 (patch) | |
| tree | bae5282b2ee875de4b01467f3cfaab54b0ab6ec0 /libavfilter/buffersink.c | |
| parent | bb6c67bb36b136de10256f0999128df4a42f9ffc (diff) | |
| download | ffmpeg-565e4993c63f797e2d50ad2f1e8f62fdbe299666.tar.gz | |
lavfi: merge start_frame/draw_slice/end_frame
Any alleged performance benefits gained from the split are purely
mythological and do not justify added code complexity.
Diffstat (limited to 'libavfilter/buffersink.c')
| -rw-r--r-- | libavfilter/buffersink.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libavfilter/buffersink.c b/libavfilter/buffersink.c index 96f5351635..a315cb394f 100644 --- a/libavfilter/buffersink.c +++ b/libavfilter/buffersink.c @@ -48,13 +48,12 @@ static av_cold void uninit(AVFilterContext *ctx) 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; av_assert0(!s->cur_buf); s->cur_buf = buf; - link->cur_buf = NULL; return 0; } @@ -144,7 +143,7 @@ static const AVFilterPad avfilter_vsink_buffer_inputs[] = { { .name = "default", .type = AVMEDIA_TYPE_VIDEO, - .start_frame = start_frame, + .filter_frame = filter_frame, .min_perms = AV_PERM_READ, .needs_fifo = 1 }, @@ -165,7 +164,7 @@ static const AVFilterPad avfilter_asink_abuffer_inputs[] = { { .name = "default", .type = AVMEDIA_TYPE_AUDIO, - .filter_samples = start_frame, + .filter_frame = filter_frame, .min_perms = AV_PERM_READ, .needs_fifo = 1 }, |