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_aspect.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_aspect.c')
| -rw-r--r-- | libavfilter/vf_aspect.c | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/libavfilter/vf_aspect.c b/libavfilter/vf_aspect.c index f1961ce217..801f927ba3 100644 --- a/libavfilter/vf_aspect.c +++ b/libavfilter/vf_aspect.c @@ -56,13 +56,6 @@ static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque) return 0; } - -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) { AspectContext *aspect = link->dst->priv; @@ -71,11 +64,6 @@ 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]); -} - #if CONFIG_ASPECT_FILTER /* for aspect filter, convert from frame aspect ratio to pixel aspect ratio */ static int frameaspect_config_props(AVFilterLink *inlink) @@ -100,9 +88,9 @@ AVFilter avfilter_vf_aspect = { .inputs = (AVFilterPad[]) {{ .name = "default", .type = CODEC_TYPE_VIDEO, .config_props = frameaspect_config_props, - .get_video_buffer = get_video_buffer, + .get_video_buffer = avfilter_null_get_video_buffer, .start_frame = start_frame, - .end_frame = end_frame }, + .end_frame = avfilter_null_end_frame }, { .name = NULL}}, .outputs = (AVFilterPad[]) {{ .name = "default", @@ -122,9 +110,9 @@ AVFilter avfilter_vf_pixelaspect = { .inputs = (AVFilterPad[]) {{ .name = "default", .type = CODEC_TYPE_VIDEO, - .get_video_buffer = get_video_buffer, + .get_video_buffer = avfilter_null_get_video_buffer, .start_frame = start_frame, - .end_frame = end_frame }, + .end_frame = avfilter_null_end_frame }, { .name = NULL}}, .outputs = (AVFilterPad[]) {{ .name = "default", |