summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libavutil/Makefile2
-rw-r--r--libavutil/avstring.c (renamed from libavutil/string.c)0
2 files changed, 1 insertions, 1 deletions
diff --git a/libavutil/Makefile b/libavutil/Makefile
index 284f874c4f..7f5b62ad6f 100644
--- a/libavutil/Makefile
+++ b/libavutil/Makefile
@@ -21,6 +21,7 @@ HEADERS = adler32.h \
OBJS = adler32.o \
aes.o \
+ avstring.o \
base64.o \
crc.o \
des.o \
@@ -37,7 +38,6 @@ OBJS = adler32.o \
rational.o \
rc4.o \
sha1.o \
- string.o \
tree.o \
utils.o \
diff --git a/libavutil/string.c b/libavutil/avstring.c
index 8ee2a6b12f..8ee2a6b12f 100644
--- a/libavutil/string.c
+++ b/libavutil/avstring.c