commit af46239a10921980f5030222dff147a592480248
author Abhishek Arya <aarya@google.com> Tue Aug 18 01:45:48 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Aug 18 01:45:48 2015 +0000
tree 008f1fc8ecebb7c0b1b6a1244c579d67ff38d3a8
parent 431312997856ce689e683ee0639cf1f4bedab7f0
parent 9abb7401df730b5c510f6b8dac2716a0928d9623

am 9abb7401: Fix compile failure after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4

* commit '9abb7401df730b5c510f6b8dac2716a0928d9623':
  Fix compile failure after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4

media/libstagefright/codecs/m4v_h263/dec/src/pvdec_api.cpp

diff --git a/media/libstagefright/codecs/m4v_h263/dec/src/pvdec_api.cpp b/media/libstagefright/codecs/m4v_h263/dec/src/pvdec_api.cpp
index 8c6622e..b1a39e6 100644
--- a/media/libstagefright/codecs/m4v_h263/dec/src/pvdec_api.cpp
+++ b/media/libstagefright/codecs/m4v_h263/dec/src/pvdec_api.cpp
@@ -22,6 +22,14 @@
 #include "vlc_decode.h"
 #include "bitstream.h"
 
+#ifndef INT32_MAX
+#define INT32_MAX 0x7fffffff
+#endif
+
+#ifndef SIZE_MAX
+#define SIZE_MAX ((size_t) -1)
+#endif
+
 #define OSCL_DISABLE_WARNING_CONDITIONAL_IS_CONSTANT
 
 #ifdef DEC_INTERNAL_MEMORY_OPT

media/libstagefright/codecs/m4v_h263/enc/src/mp4enc_api.cpp

diff --git a/media/libstagefright/codecs/m4v_h263/enc/src/mp4enc_api.cpp b/media/libstagefright/codecs/m4v_h263/enc/src/mp4enc_api.cpp
index d2a930c..6c4510e 100644
--- a/media/libstagefright/codecs/m4v_h263/enc/src/mp4enc_api.cpp
+++ b/media/libstagefright/codecs/m4v_h263/enc/src/mp4enc_api.cpp
@@ -23,6 +23,13 @@
 #include "rate_control.h"
 #include "m4venc_oscl.h"
 
+#ifndef INT32_MAX
+#define INT32_MAX 0x7fffffff
+#endif
+
+#ifndef SIZE_MAX
+#define SIZE_MAX ((size_t) -1)
+#endif
 
 /* Inverse normal zigzag */
 const static Int zigzag_i[NCOEFF_BLOCK] =