diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-31 22:02:08 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-01 06:05:08 +0200 |
| commit | e4e02a7d4726e9370127741eb2873d6671d3f0c3 (patch) | |
| tree | 69d0695f5e362d68ad12eb01e9432341564f96f6 /libavfilter/buffersink.c | |
| parent | 9d89c8b3ac80134f0bd32512eb208b113795ab9e (diff) | |
| download | ffmpeg-e4e02a7d4726e9370127741eb2873d6671d3f0c3.tar.gz | |
libavfilter: Support the forks ABI for buffer sinks
With this change avconv compiled against libav and linked to ffmpegs libs
will run through the whole fate testsuite without any crashes.
857 tests pass, the remaining tests fail one way or another, which is
to be expected as avconv is not a drop in replacement for ffmpeg
The testsuite used was the ffmpeg fate testsuite, not libavs.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/buffersink.c')
| -rw-r--r-- | libavfilter/buffersink.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/libavfilter/buffersink.c b/libavfilter/buffersink.c index e66a099c14..50cd6d4e96 100644 --- a/libavfilter/buffersink.c +++ b/libavfilter/buffersink.c @@ -141,7 +141,11 @@ int av_buffersink_read_samples(AVFilterContext *ctx, AVFilterBufferRef **pbuf, } AVFilter avfilter_vsink_buffer = { +#if AV_HAVE_INCOMPATIBLE_FORK_ABI + .name = "buffersink", +#else .name = "buffersink_old", +#endif .description = NULL_IF_CONFIG_SMALL("Buffer video frames, and make them available to the end of the filter graph."), .priv_size = sizeof(BufferSinkContext), .uninit = uninit, @@ -156,7 +160,11 @@ AVFilter avfilter_vsink_buffer = { }; AVFilter avfilter_asink_abuffer = { +#if AV_HAVE_INCOMPATIBLE_FORK_ABI + .name = "abuffersink", +#else .name = "abuffersink_old", +#endif .description = NULL_IF_CONFIG_SMALL("Buffer audio frames, and make them available to the end of the filter graph."), .priv_size = sizeof(BufferSinkContext), .uninit = uninit, |