diff options
| author | Abhishek Arya <aarya@google.com> | 2015-08-17 18:24:11 -0700 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-10-19 01:49:51 +0200 |
| commit | f9c20f217b6f8a4d89f5112aba788c62010c8c87 (patch) | |
| tree | 92cea5449f133473e78eea799ce8cac6a6597db8 /media | |
| parent | 28722012e0156407394383431a28ac362688abb6 (diff) | |
| download | frameworks_av-f9c20f217b6f8a4d89f5112aba788c62010c8c87.zip frameworks_av-f9c20f217b6f8a4d89f5112aba788c62010c8c87.tar.gz frameworks_av-f9c20f217b6f8a4d89f5112aba788c62010c8c87.tar.bz2 | |
Fix compile failure after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4
Bug: 20674086
Change-Id: I2ee6b7e0eabbf696c0986d08b2d759d48cb9eb7b
Tested-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/codecs/m4v_h263/dec/src/pvdec_api.cpp | 8 | ||||
| -rw-r--r-- | media/libstagefright/codecs/m4v_h263/enc/src/mp4enc_api.cpp | 7 |
2 files changed, 15 insertions, 0 deletions
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 74c4b2b..0802e29 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] = |