aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClément Bœsch <ubitux@gmail.com>2011-11-15 22:17:58 +0100
committerClément Bœsch <ubitux@gmail.com>2011-11-16 07:27:20 +0100
commit7e516a11cacc327403a636cc30786f5f2a0ada59 (patch)
treeb2b4e24ff8bbe07cc948ba4bc0b0c2167a77afb6
parentfc42550097b21082211cdadd21b7246c6f4dba6c (diff)
downloadffmpeg-7e516a11cacc327403a636cc30786f5f2a0ada59.tar.gz
swr: rename resample2 to resample.
-rw-r--r--libswresample/Makefile2
-rw-r--r--libswresample/resample.c (renamed from libswresample/resample2.c)0
2 files changed, 1 insertions, 1 deletions
diff --git a/libswresample/Makefile b/libswresample/Makefile
index 7435162793..cc3038fd72 100644
--- a/libswresample/Makefile
+++ b/libswresample/Makefile
@@ -5,7 +5,7 @@ FFLIBS = avutil
HEADERS = swresample.h
-OBJS = swresample.o audioconvert.o resample2.o rematrix.o
+OBJS = swresample.o audioconvert.o resample.o rematrix.o
TESTPROGS = swresample_test
diff --git a/libswresample/resample2.c b/libswresample/resample.c
index 02f29bacf1..02f29bacf1 100644
--- a/libswresample/resample2.c
+++ b/libswresample/resample.c