lavfi: merge asrc_abuffer into vsrc_buffer.

7ad0d986 · Nicolas George · 28c57751 · 7ad0d986 · 28c57751 · 7ad0d986
Commit 7ad0d986 authored Apr 27, 2012 by Nicolas George
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 338 additions and 381 deletions

Makefile libavfilter/Makefile +0 -1

asrc_abuffer.c libavfilter/asrc_abuffer.c +0 -369

vsrc_buffer.c libavfilter/vsrc_buffer.c +338 -11

No files found.
--- a/libavfilter/Makefile
+++ b/libavfilter/Makefile
@@ -42,7 +42,6 @@ OBJS-$(CONFIG_PAN_FILTER)                    += af_pan.o
 OBJS-$(CONFIG_SILENCEDETECT_FILTER)          += af_silencedetect.o
 OBJS-$(CONFIG_VOLUME_FILTER)                 += af_volume.o
-OBJS-$(CONFIG_ABUFFER_FILTER)                += asrc_abuffer.o
 OBJS-$(CONFIG_AEVALSRC_FILTER)               += asrc_aevalsrc.o
 OBJS-$(CONFIG_AMOVIE_FILTER)                 += src_movie.o
 OBJS-$(CONFIG_ANULLSRC_FILTER)               += asrc_anullsrc.o

--- a/libavfilter/asrc_abuffer.c
+++ b/libavfilter/asrc_abuffer.c
--- a/libavfilter/vsrc_buffer.c
+++ b/libavfilter/vsrc_buffer.c