diff options
| author | Bobby Bingham <uhmmmm@gmail.com> | 2010-03-18 23:13:02 +0000 |
|---|---|---|
| committer | Bobby Bingham <uhmmmm@gmail.com> | 2010-03-18 23:13:02 +0000 |
| commit | d313e17ab1180fcced3e61736e6e87f3d4f5101e (patch) | |
| tree | 91cc5ac6f11fa26f138f7dc5a75db16e7527e40f /libavfilter/vf_format.c | |
| parent | 91d1c741bfa5c39c222bb3f86357a9da50227df1 (diff) | |
Use the new null callbacks to simplify filters and reduce duplicated code.
Originally committed as revision 22595 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavfilter/vf_format.c')
| -rw-r--r-- | libavfilter/vf_format.c | 37 |
1 files changed, 8 insertions, 29 deletions
diff --git a/libavfilter/vf_format.c b/libavfilter/vf_format.c index a501e1a72b..2c84b0ab1a 100644 --- a/libavfilter/vf_format.c +++ b/libavfilter/vf_format.c @@ -85,27 +85,6 @@ static AVFilterFormats *make_format_list(FormatContext *format, int flag) return formats; } -static AVFilterPicRef *get_video_buffer(AVFilterLink *link, int perms, - int w, int h) -{ - return avfilter_get_video_buffer(link->dst->outputs[0], perms, w, h); -} - -static void start_frame(AVFilterLink *link, AVFilterPicRef *picref) -{ - avfilter_start_frame(link->dst->outputs[0], picref); -} - -static void end_frame(AVFilterLink *link) -{ - avfilter_end_frame(link->dst->outputs[0]); -} - -static void draw_slice(AVFilterLink *link, int y, int h, int slice_dir) -{ - avfilter_draw_slice(link->dst->outputs[0], y, h, slice_dir); -} - #if CONFIG_FORMAT_FILTER static int query_formats_format(AVFilterContext *ctx) { @@ -125,10 +104,10 @@ AVFilter avfilter_vf_format = { .inputs = (AVFilterPad[]) {{ .name = "default", .type = CODEC_TYPE_VIDEO, - .get_video_buffer= get_video_buffer, - .start_frame = start_frame, - .draw_slice = draw_slice, - .end_frame = end_frame, }, + .get_video_buffer= avfilter_null_get_video_buffer, + .start_frame = avfilter_null_start_frame, + .draw_slice = avfilter_null_draw_slice, + .end_frame = avfilter_null_end_frame, }, { .name = NULL}}, .outputs = (AVFilterPad[]) {{ .name = "default", .type = CODEC_TYPE_VIDEO }, @@ -155,10 +134,10 @@ AVFilter avfilter_vf_noformat = { .inputs = (AVFilterPad[]) {{ .name = "default", .type = CODEC_TYPE_VIDEO, - .get_video_buffer= get_video_buffer, - .start_frame = start_frame, - .draw_slice = draw_slice, - .end_frame = end_frame, }, + .get_video_buffer= avfilter_null_get_video_buffer, + .start_frame = avfilter_null_start_frame, + .draw_slice = avfilter_null_draw_slice, + .end_frame = avfilter_null_end_frame, }, { .name = NULL}}, .outputs = (AVFilterPad[]) {{ .name = "default", .type = CODEC_TYPE_VIDEO }, |