diff options
| author | 2009-12-19 09:00:17 -0800 | |
|---|---|---|
| committer | 2009-12-19 09:00:17 -0800 | |
| commit | 122fe7e10297ce51d63b6076a33573d217f3f1cc (patch) | |
| tree | f6cfa84d4b3a726bb37f85f1849305e63a789eaa | |
| parent | 2473eb4a33b226758e1f5db322cb8d687ce01602 (diff) | |
| parent | 4d0e827d0be6085893428b420ec5800f1973a43b (diff) | |
am 4d0e827d: Attempt to fix simular build break. Missing header file stdlib.h for free, malloc, etc
Merge commit '4d0e827d0be6085893428b420ec5800f1973a43b' into eclair-mr2-plus-aosp
* commit '4d0e827d0be6085893428b420ec5800f1973a43b':
Attempt to fix simular build break.
| -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 10687e0d3662..c3ef0d28929d 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 e427b64da673..ec6871f3a6f8 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; |