summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/codecs
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2015-01-29 17:22:05 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-01-29 17:22:05 +0000
commitf26334cf7d60060e0e33b037dd9504c81b2e10eb (patch)
tree0862537ea39c13222a34f9ede807157dff0a4743 /media/libstagefright/codecs
parent5ba2e2cbb6ae3d470bf3031507ea938be6066ed7 (diff)
parent6a0fbc68e203058e3b7d62e95d46f2415bc3ed95 (diff)
downloadframeworks_av-f26334cf7d60060e0e33b037dd9504c81b2e10eb.zip
frameworks_av-f26334cf7d60060e0e33b037dd9504c81b2e10eb.tar.gz
frameworks_av-f26334cf7d60060e0e33b037dd9504c81b2e10eb.tar.bz2
am 6a0fbc68: am a3c9d5c3: am 166776fb: Merge "Add missing includes."
* commit '6a0fbc68e203058e3b7d62e95d46f2415bc3ed95': Add missing includes.
Diffstat (limited to 'media/libstagefright/codecs')
-rw-r--r--media/libstagefright/codecs/amrnb/dec/test/amrnbdec_test.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/media/libstagefright/codecs/amrnb/dec/test/amrnbdec_test.cpp b/media/libstagefright/codecs/amrnb/dec/test/amrnbdec_test.cpp
index 521fe2b..41a9e98 100644
--- a/media/libstagefright/codecs/amrnb/dec/test/amrnbdec_test.cpp
+++ b/media/libstagefright/codecs/amrnb/dec/test/amrnbdec_test.cpp
@@ -26,6 +26,7 @@
* SUCH DAMAGE.
*/
+#include <malloc.h>
#include <stdio.h>
#include <stdint.h>
#include <string.h>