Updated FFMPEG to version 1.1.2, using this project: http://sourceforge.net/projects/ffmpeg4android/

2013-02-21 18:29:51 +02:00
parent 758a9658d2
commit fff7a99a41
3492 changed files with 886704 additions and 5414 deletions
--- a/project/jni/ffmpeg/libswresample/Makefile.android
+++ b/project/jni/ffmpeg/libswresample/Makefile.android
@@ -0,0 +1,18 @@
+#include $(SUBDIR)../config.mak
+
+NAME = swresample
+FFLIBS = avutil
+
+HEADERS = swresample.h                       \
+          version.h                          \
+
+OBJS = audioconvert.o                        \
+       dither.o                              \
+       log2_tab.o                            \
+       rematrix.o                            \
+       resample.o                            \
+       swresample.o                          \
+
+OBJS-$(CONFIG_LIBSOXR) += soxr_resample.o
+
+TESTPROGS = swresample