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/buffersrc.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/buffersrc.c')
-rw-r--r-- | libavfilter/buffersrc.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/libavfilter/buffersrc.c b/libavfilter/buffersrc.c index 9354691862..3cee68da43 100644 --- a/libavfilter/buffersrc.c +++ b/libavfilter/buffersrc.c @@ -327,20 +327,7 @@ static int request_frame(AVFilterLink *link) } av_fifo_generic_read(c->fifo, &buf, sizeof(buf), NULL); - switch (link->type) { - case AVMEDIA_TYPE_VIDEO: - if ((ret = ff_start_frame(link, buf)) < 0 || - (ret = ff_draw_slice(link, 0, link->h, 1)) < 0 || - (ret = ff_end_frame(link)) < 0) - return ret; - break; - case AVMEDIA_TYPE_AUDIO: - ret = ff_filter_samples(link, buf); - break; - default: - avfilter_unref_bufferp(&buf); - return AVERROR(EINVAL); - } + ff_filter_frame(link, buf); return ret; } |