fix compile warning -- -fpermissive

diff --git a/libstagefright/FFmpegExtractor/Android.mk b/libstagefright/FFmpegExtractor/Android.mk
index 431fec7..3b81a86 100644 (file)
--- a/libstagefright/FFmpegExtractor/Android.mk
+++ b/libstagefright/FFmpegExtractor/Android.mk
@@ -38,8 +38,8 @@ endif
 
 LOCAL_CFLAGS += -D__STDC_CONSTANT_MACROS=1 -D__STDINT_LIMITS=1
 
-ifeq ($(TARGET_ARCH),arm)
-       LOCAL_CFLAGS += -fpermissive
-endif
+#ifeq ($(TARGET_ARCH),arm)
+#      LOCAL_CFLAGS += -fpermissive
+#endif
 
 include $(BUILD_SHARED_LIBRARY)

diff --git a/libstagefright/FFmpegExtractor/FFmpegExtractor.cpp b/libstagefright/FFmpegExtractor/FFmpegExtractor.cpp
index 885ef21..54d53ec 100644 (file)
--- a/libstagefright/FFmpegExtractor/FFmpegExtractor.cpp
+++ b/libstagefright/FFmpegExtractor/FFmpegExtractor.cpp
@@ -749,7 +749,7 @@ int FFmpegExtractor::stream_component_open(int stream_index)
         }
 
         if (avctx->extradata) {
-            ALOGV("audio stream extradata:");
+            ALOGV("audio stream extradata(%d):", avctx->extradata_size);
             hexdump(avctx->extradata, avctx->extradata_size);
         } else {
             ALOGV("audio stream no extradata, but we can ignore it.");

diff --git a/libstagefright/FFmpegExtractor/FFmpegExtractor.h b/libstagefright/FFmpegExtractor/FFmpegExtractor.h
index 0f73077..38f0a52 100644 (file)
--- a/libstagefright/FFmpegExtractor/FFmpegExtractor.h
+++ b/libstagefright/FFmpegExtractor/FFmpegExtractor.h
@@ -42,7 +42,6 @@ extern "C" {
 #include "libavutil/parseutils.h"
 #include "libavutil/samplefmt.h"
 #include "libavutil/avassert.h"
-#include "libavutil/intreadwrite.h"
 #include "libavformat/avformat.h"
 #include "libavdevice/avdevice.h"
 #include "libswscale/swscale.h"

diff --git a/libstagefright/codecs/ffmpegdec/adec/Android.mk b/libstagefright/codecs/ffmpegdec/adec/Android.mk
index f9ba575..77e3dfd 100644 (file)
--- a/libstagefright/codecs/ffmpegdec/adec/Android.mk
+++ b/libstagefright/codecs/ffmpegdec/adec/Android.mk
@@ -39,8 +39,8 @@ endif
 
 LOCAL_CFLAGS += -D__STDC_CONSTANT_MACROS=1
 
-ifeq ($(TARGET_ARCH),arm)
-       LOCAL_CFLAGS += -fpermissive
-endif
+#ifeq ($(TARGET_ARCH),arm)
+#      LOCAL_CFLAGS += -fpermissive
+#endif
 
 include $(BUILD_SHARED_LIBRARY)

diff --git a/libstagefright/codecs/ffmpegdec/adec/SoftFFmpegAudio.h b/libstagefright/codecs/ffmpegdec/adec/SoftFFmpegAudio.h
index 6e148b6..3789efc 100644 (file)
--- a/libstagefright/codecs/ffmpegdec/adec/SoftFFmpegAudio.h
+++ b/libstagefright/codecs/ffmpegdec/adec/SoftFFmpegAudio.h
@@ -43,7 +43,6 @@ extern "C" {
 #include "libavutil/parseutils.h"
 #include "libavutil/samplefmt.h"
 #include "libavutil/avassert.h"
-#include "libavutil/intreadwrite.h"
 #include "libavformat/avformat.h"
 #include "libavdevice/avdevice.h"
 #include "libswscale/swscale.h"

diff --git a/libstagefright/codecs/ffmpegdec/vdec/Android.mk b/libstagefright/codecs/ffmpegdec/vdec/Android.mk
index 2c838ad..db6b991 100644 (file)
--- a/libstagefright/codecs/ffmpegdec/vdec/Android.mk
+++ b/libstagefright/codecs/ffmpegdec/vdec/Android.mk
@@ -36,8 +36,8 @@ endif
 
 LOCAL_CFLAGS += -D__STDC_CONSTANT_MACROS=1
 
-ifeq ($(TARGET_ARCH),arm)
-       LOCAL_CFLAGS += -fpermissive
-endif
+#ifeq ($(TARGET_ARCH),arm)
+#      LOCAL_CFLAGS += -fpermissive
+#endif
 
 include $(BUILD_SHARED_LIBRARY)

diff --git a/libstagefright/codecs/ffmpegdec/vdec/SoftFFmpegVideo.cpp b/libstagefright/codecs/ffmpegdec/vdec/SoftFFmpegVideo.cpp
index af2267d..27deca4 100644 (file)
--- a/libstagefright/codecs/ffmpegdec/vdec/SoftFFmpegVideo.cpp
+++ b/libstagefright/codecs/ffmpegdec/vdec/SoftFFmpegVideo.cpp
@@ -742,7 +742,7 @@ int32_t SoftFFmpegVideo::openDecoder() {
 
     int err = avcodec_open2(mCtx, mCtx->codec, NULL);
     if (err < 0) {
-        ALOGE("ffmpeg video decoder failed to initialize. (%d)", err);
+        ALOGE("ffmpeg video decoder failed to initialize. (%s)", av_err2str(err));
         return ERR_DECODER_OPEN_FAILED;
     }
        mCodecAlreadyOpened = true;

diff --git a/libstagefright/codecs/ffmpegdec/vdec/SoftFFmpegVideo.h b/libstagefright/codecs/ffmpegdec/vdec/SoftFFmpegVideo.h
index 309daa5..653c948 100644 (file)
--- a/libstagefright/codecs/ffmpegdec/vdec/SoftFFmpegVideo.h
+++ b/libstagefright/codecs/ffmpegdec/vdec/SoftFFmpegVideo.h
@@ -38,7 +38,6 @@ extern "C" {
 #include "libavutil/parseutils.h"
 #include "libavutil/samplefmt.h"
 #include "libavutil/avassert.h"
-#include "libavutil/intreadwrite.h"
 #include "libavformat/avformat.h"
 #include "libavdevice/avdevice.h"
 #include "libswscale/swscale.h"