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/vf_aspect.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/vf_aspect.c')
| -rw-r--r-- | libavfilter/vf_aspect.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/libavfilter/vf_aspect.c b/libavfilter/vf_aspect.c index 9f0c0c00a6..d7e851c928 100644 --- a/libavfilter/vf_aspect.c +++ b/libavfilter/vf_aspect.c @@ -65,13 +65,12 @@ static av_cold int init(AVFilterContext *ctx, const char *args) return 0; } -static int start_frame(AVFilterLink *link, AVFilterBufferRef *picref) +static int filter_frame(AVFilterLink *link, AVFilterBufferRef *frame) { AspectContext *aspect = link->dst->priv; - picref->video->pixel_aspect = aspect->aspect; - link->cur_buf = NULL; - return ff_start_frame(link->dst->outputs[0], picref); + frame->video->pixel_aspect = aspect->aspect; + return ff_filter_frame(link->dst->outputs[0], frame); } #if CONFIG_SETDAR_FILTER @@ -99,8 +98,7 @@ static const AVFilterPad avfilter_vf_setdar_inputs[] = { .type = AVMEDIA_TYPE_VIDEO, .config_props = setdar_config_props, .get_video_buffer = ff_null_get_video_buffer, - .start_frame = start_frame, - .end_frame = ff_null_end_frame + .filter_frame = filter_frame, }, { NULL } }; @@ -144,8 +142,7 @@ static const AVFilterPad avfilter_vf_setsar_inputs[] = { .type = AVMEDIA_TYPE_VIDEO, .config_props = setsar_config_props, .get_video_buffer = ff_null_get_video_buffer, - .start_frame = start_frame, - .end_frame = ff_null_end_frame + .filter_frame = filter_frame, }, { NULL } }; |