summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2015-08-07 14:32:40 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-07 14:32:40 +0000
commit171b5fadb9d304f5e06686e4f3d060ef335d7250 (patch)
tree8d45331766e9cb5c701db4a8ca4e51e89f1ac5ad /include
parentd8bb17e33ef33ce173fa2d096211785145d41921 (diff)
parentd6ea7f65dd31d5dacf497cc3c494d4fa3910f7c3 (diff)
downloadframeworks_av-171b5fadb9d304f5e06686e4f3d060ef335d7250.zip
frameworks_av-171b5fadb9d304f5e06686e4f3d060ef335d7250.tar.gz
frameworks_av-171b5fadb9d304f5e06686e4f3d060ef335d7250.tar.bz2
am d6ea7f65: am f26400c9: Fix crash on malformed id3
* commit 'd6ea7f65dd31d5dacf497cc3c494d4fa3910f7c3': Fix crash on malformed id3
Diffstat (limited to 'include')
-rw-r--r--include/media/stagefright/MetaData.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/media/stagefright/MetaData.h b/include/media/stagefright/MetaData.h
index 087d016..3f42790 100644
--- a/include/media/stagefright/MetaData.h
+++ b/include/media/stagefright/MetaData.h
@@ -260,7 +260,7 @@ private:
return mSize <= sizeof(u.reservoir);
}
- void allocateStorage(size_t size);
+ void *allocateStorage(size_t size);
void freeStorage();
void *storage() {