summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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