compile fixes, include bug "error: 'INT64_MIN' was not declared in this scope"

diff --git a/ffmpeg_utils/ffmpeg_utils.cpp b/ffmpeg_utils/ffmpeg_utils.cpp
index f694ff7..f83e359 100644 (file)
--- a/ffmpeg_utils/ffmpeg_utils.cpp
+++ b/ffmpeg_utils/ffmpeg_utils.cpp
@@ -25,7 +25,6 @@ extern "C" {
 #include <stdlib.h>
 #include <inttypes.h>
 #include <math.h>
-#include <limits.h>
 #include <signal.h>
 #include <limits.h> /* INT_MAX */
 
@@ -169,13 +168,18 @@ extern "C" {
 
 #include "cmdutils.h"
 
+const char program_name[] = "dummy";
+const int program_birth_year = 2012;
+
 void av_noreturn exit_program(int ret)
 {
     // do nothing
 }
 
-const char program_name[] = "dummy";
-const int program_birth_year = 2012;
+void show_help_default(const char *opt, const char *arg)
+{
+    // do nothing
+}
 
 #ifdef __cplusplus
 }

diff --git a/libstagefright/FFmpegExtractor/Android.mk b/libstagefright/FFmpegExtractor/Android.mk
index 3ced619..4e7db47 100644 (file)
--- a/libstagefright/FFmpegExtractor/Android.mk
+++ b/libstagefright/FFmpegExtractor/Android.mk
@@ -63,6 +63,6 @@ ifeq ($(TARGET_ARCH),arm)
     LOCAL_CFLAGS += -Wno-psabi
 endif
 
-LOCAL_CFLAGS += -D__STDC_CONSTANT_MACROS=1
+LOCAL_CFLAGS += -D__STDC_CONSTANT_MACROS=1 -D__STDINT_LIMITS=1
 
 include $(BUILD_SHARED_LIBRARY)

diff --git a/libstagefright/FFmpegExtractor/FFmpegExtractor.h b/libstagefright/FFmpegExtractor/FFmpegExtractor.h
index 4ea2e61..e0d9826 100644 (file)
--- a/libstagefright/FFmpegExtractor/FFmpegExtractor.h
+++ b/libstagefright/FFmpegExtractor/FFmpegExtractor.h
@@ -29,7 +29,7 @@ extern "C" {
 
 #include <inttypes.h>
 #include <math.h>
-#include <limits.h>
+#include <limits.h> /* INT_MAX */
 #include <signal.h>
 #include <limits.h> /* INT_MAX */
 

diff --git a/libstagefright/codecs/ffmpegdec/vdec/SoftFFmpegVideo.cpp b/libstagefright/codecs/ffmpegdec/vdec/SoftFFmpegVideo.cpp
index 636d8f4..b304d0f 100644 (file)
--- a/libstagefright/codecs/ffmpegdec/vdec/SoftFFmpegVideo.cpp
+++ b/libstagefright/codecs/ffmpegdec/vdec/SoftFFmpegVideo.cpp
@@ -217,7 +217,7 @@ void SoftFFmpegVideo::deInitFFmpeg() {
 }
 
 
-void SoftFFmpegVideo::setAVCtxToDefault(AVCodecContext *avctx, AVCodec *codec) {
+void SoftFFmpegVideo::setAVCtxToDefault(AVCodecContext *avctx, const AVCodec *codec) {
     int fast = 0;
 
     avctx->workaround_bugs   = 1;

diff --git a/libstagefright/codecs/ffmpegdec/vdec/SoftFFmpegVideo.h b/libstagefright/codecs/ffmpegdec/vdec/SoftFFmpegVideo.h
index f9b308b..49a003d 100644 (file)
--- a/libstagefright/codecs/ffmpegdec/vdec/SoftFFmpegVideo.h
+++ b/libstagefright/codecs/ffmpegdec/vdec/SoftFFmpegVideo.h
@@ -116,7 +116,7 @@ private:
 
     status_t initFFmpeg();
     void deInitFFmpeg();
-    void setAVCtxToDefault(AVCodecContext *avctx, AVCodec *codec);
+    void setAVCtxToDefault(AVCodecContext *avctx, const AVCodec *codec);
 
     void initPorts();
     status_t initDecoder();