| commit | b80a824561a710bbef2f47e80160f9140e2aceb7 | [log] [tgz] |
|---|---|---|
| author | Abhishek Arya <aarya@google.com> | Mon Aug 17 18:24:11 2015 -0700 |
| committer | The Android Automerger <android-build@android.com> | Wed Sep 02 18:20:44 2015 -0700 |
| tree | 1b5c7af1350bceaa55e96b75f41e97d4df0a1bcf | |
| parent | 32bc490887cc75408600c9f45147a2f72777f17f [diff] |
Fix compile failure after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4 Bug: 20674086 Change-Id: I2ee6b7e0eabbf696c0986d08b2d759d48cb9eb7b
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 bf512e9..9fd9cd2 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
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 14b5b0b..5ea0de4 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] =