diff options
| author | Nicolas George <nicolas.george@normalesup.org> | 2013-03-11 21:26:03 +0100 |
|---|---|---|
| committer | Nicolas George <nicolas.george@normalesup.org> | 2013-03-12 23:31:07 +0100 |
| commit | 9a2688826dd479df2edd3967435afc1fb33b433f (patch) | |
| tree | 7bee7a71d57092a0e6c98aaeddc0cb484d5496fd /libavfilter | |
| parent | f7b041b11b0f1dcfe99918230b56859e6960b9f4 (diff) | |
| download | ffmpeg-9a2688826dd479df2edd3967435afc1fb33b433f.tar.gz | |
lavfi/buffersink: rename filter structures.
Reduce the diff with the fork.
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/allfilters.c | 8 | ||||
| -rw-r--r-- | libavfilter/buffersink.c | 12 |
2 files changed, 8 insertions, 12 deletions
diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c index f9e5d50ac7..f83cdc4788 100644 --- a/libavfilter/allfilters.c +++ b/libavfilter/allfilters.c @@ -185,17 +185,13 @@ void avfilter_register_all(void) REGISTER_FILTER_UNCONDITIONAL(vsink_ffbuffersink); REGISTER_FILTER_UNCONDITIONAL(asink_ffabuffersink); -#if !AV_HAVE_INCOMPATIBLE_FORK_ABI - REGISTER_FILTER_UNCONDITIONAL(vsink_buffersink); - REGISTER_FILTER_UNCONDITIONAL(asink_abuffersink); -#endif /* those filters are part of public or internal API => registered * unconditionally */ REGISTER_FILTER_UNCONDITIONAL(asrc_abuffer); REGISTER_FILTER_UNCONDITIONAL(vsrc_buffer); - //REGISTER_FILTER_UNCONDITIONAL(asink_abuffer); - //REGISTER_FILTER_UNCONDITIONAL(vsink_buffer); + REGISTER_FILTER_UNCONDITIONAL(asink_abuffer); + REGISTER_FILTER_UNCONDITIONAL(vsink_buffer); REGISTER_FILTER_UNCONDITIONAL(af_afifo); REGISTER_FILTER_UNCONDITIONAL(vf_fifo); } diff --git a/libavfilter/buffersink.c b/libavfilter/buffersink.c index a3e3095590..4b9918edcf 100644 --- a/libavfilter/buffersink.c +++ b/libavfilter/buffersink.c @@ -512,7 +512,7 @@ AVFilter avfilter_asink_ffabuffersink = { .outputs = NULL, }; -static const AVFilterPad buffersink_inputs[] = { +static const AVFilterPad avfilter_vsink_buffer_inputs[] = { { .name = "default", .type = AVMEDIA_TYPE_VIDEO, @@ -521,7 +521,7 @@ static const AVFilterPad buffersink_inputs[] = { { NULL } }; -AVFilter avfilter_vsink_buffersink = { +AVFilter avfilter_vsink_buffer = { .name = "buffersink", .description = NULL_IF_CONFIG_SMALL("Buffer video frames, and make them available to the end of the filter graph."), .priv_size = sizeof(BufferSinkContext), @@ -529,11 +529,11 @@ AVFilter avfilter_vsink_buffersink = { .uninit = uninit, .query_formats = vsink_query_formats, - .inputs = buffersink_inputs, + .inputs = avfilter_vsink_buffer_inputs, .outputs = NULL, }; -static const AVFilterPad abuffersink_inputs[] = { +static const AVFilterPad avfilter_asink_abuffer_inputs[] = { { .name = "default", .type = AVMEDIA_TYPE_AUDIO, @@ -542,7 +542,7 @@ static const AVFilterPad abuffersink_inputs[] = { { NULL } }; -AVFilter avfilter_asink_abuffersink = { +AVFilter avfilter_asink_abuffer = { .name = "abuffersink", .description = NULL_IF_CONFIG_SMALL("Buffer audio frames, and make them available to the end of the filter graph."), .priv_size = sizeof(BufferSinkContext), @@ -550,6 +550,6 @@ AVFilter avfilter_asink_abuffersink = { .uninit = uninit, .query_formats = asink_query_formats, - .inputs = abuffersink_inputs, + .inputs = avfilter_asink_abuffer_inputs, .outputs = NULL, }; |