diff options
| author | James Dong <jdong@google.com> | 2009-12-19 09:03:27 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-19 09:03:27 -0800 |
| commit | 01d48d20f8e69061cd41741c2ed5c7f2dc8f2116 (patch) | |
| tree | 34401453f7f63d90750ed342eba274964cdf7805 /media | |
| parent | f9918ed60e9fb3050e93e68d714f92f647ef00ab (diff) | |
| parent | 274316df9dfb163df01339bf7babadb2ea6cfb6a (diff) | |
| download | frameworks_av-01d48d20f8e69061cd41741c2ed5c7f2dc8f2116.zip frameworks_av-01d48d20f8e69061cd41741c2ed5c7f2dc8f2116.tar.gz frameworks_av-01d48d20f8e69061cd41741c2ed5c7f2dc8f2116.tar.bz2 | |
am 122fe7e1: am 4d0e827d: Attempt to fix simular build break. Missing header file stdlib.h for free, malloc, etc
Merge commit '122fe7e10297ce51d63b6076a33573d217f3f1cc'
* commit '122fe7e10297ce51d63b6076a33573d217f3f1cc':
Attempt to fix simular build break.
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/codecs/m4v_h263/dec/M4vH263Decoder.cpp | 2 | ||||
| -rw-r--r-- | media/libstagefright/codecs/m4v_h263/dec/include/m4vh263_decoder_pv_types.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/media/libstagefright/codecs/m4v_h263/dec/M4vH263Decoder.cpp b/media/libstagefright/codecs/m4v_h263/dec/M4vH263Decoder.cpp index 10687e0..c3ef0d2 100644 --- a/media/libstagefright/codecs/m4v_h263/dec/M4vH263Decoder.cpp +++ b/media/libstagefright/codecs/m4v_h263/dec/M4vH263Decoder.cpp @@ -16,7 +16,7 @@ //#define LOG_NDEBUG 0 #define LOG_TAG "M4vH263Decoder" #include <utils/Log.h> - +#include <stdlib.h> // for free #include "ESDS.h" #include "M4vH263Decoder.h" diff --git a/media/libstagefright/codecs/m4v_h263/dec/include/m4vh263_decoder_pv_types.h b/media/libstagefright/codecs/m4v_h263/dec/include/m4vh263_decoder_pv_types.h index e427b64..ec6871f 100644 --- a/media/libstagefright/codecs/m4v_h263/dec/include/m4vh263_decoder_pv_types.h +++ b/media/libstagefright/codecs/m4v_h263/dec/include/m4vh263_decoder_pv_types.h @@ -21,6 +21,7 @@ #include <stdint.h> #include <string.h> +#include <stdlib.h> // for free, malloc, etc // Redefine the int types typedef uint8_t uint8; |