Android-x86
Fork
Donation

  • R/O
  • HTTP
  • SSH
  • HTTPS

external-ffmpeg: Commit

external/ffmpeg


Commit MetaInfo

Revisión4bdbfa17647409cb81bb9d5545fcced69469cdb9 (tree)
Tiempo2017-06-08 00:42:31
AutorChih-Wei Huang <cwhuang@linu...>
CommiterChih-Wei Huang

Log Message

android: quiet some warnings

Cambiar Resumen

Diferencia

--- a/android/build.mk
+++ b/android/build.mk
@@ -64,7 +64,7 @@ LOCAL_CFLAGS += \
6464 -O3 -std=c99 -fno-math-errno -fno-signed-zeros -fomit-frame-pointer \
6565 -Wno-pointer-to-int-cast -Wstrict-prototypes -Wempty-body -Wno-parentheses \
6666 -Wno-switch -Wno-format-zero-length -Wno-pointer-sign -Wno-unused-parameter \
67- -Wno-unknown-attributes -Wno-missing-field-initializers -Wno-sign-compare \
67+ -Wno-deprecated-declarations -Wno-missing-field-initializers -Wno-sign-compare \
6868 -Werror=format-security -Werror=implicit-function-declaration -Werror=missing-prototypes \
6969 -Werror=return-type -Werror=vla -Wformat -Wno-maybe-uninitialized -fPIC
7070
@@ -73,6 +73,7 @@ LOCAL_ASFLAGS_x86_64 := -Pconfig-x86_64.asm
7373
7474 LOCAL_LDFLAGS := -Wl,--no-fatal-warnings -Wl,-Bsymbolic
7575
76+LOCAL_CLANG_CFLAGS += -Wno-unknown-attributes
7677 LOCAL_CLANG_ASFLAGS += $(if $(filter x86,$(FFMPEG_ARCH_DIR)),,-no-integrated-as)
7778
7879 LOCAL_SHARED_LIBRARIES := $($(NAME)_FFLIBS:%=lib%)
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -1055,6 +1055,7 @@ TESTPROGS-$(CONFIG_SNOW_ENCODER) += snowenc
10551055
10561056 TESTOBJS = dctref.o
10571057
1058+ifndef CONFIG_ANDROID
10581059 TOOLS = fourcc2pixfmt
10591060
10601061 HOSTPROGS = aacps_tablegen \
@@ -1111,3 +1112,4 @@ $(SUBDIR)qdm2.o: $(SUBDIR)qdm2_tables.h
11111112 $(SUBDIR)sinewin.o: $(SUBDIR)sinewin_tables.h
11121113 $(SUBDIR)sinewin_fixed.o: $(SUBDIR)sinewin_fixed_tables.h
11131114 endif
1115+endif # CONFIG_ANDROID
Show on old repository browser