diff options
| author | Andy Hung <hunga@google.com> | 2014-09-22 19:01:38 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-22 19:01:38 +0000 |
| commit | d7f77cd78f5180ba7a04b270d632cc4f9f11718a (patch) | |
| tree | b7110dfa83901fc8da23bda42b35c3205a75114c /include/media | |
| parent | 0079b331227fc1555d7c5305f33917a570d44890 (diff) | |
| parent | dc9f58dc23a86d0635fd8601d1cbc8d47bab0303 (diff) | |
| download | frameworks_av-d7f77cd78f5180ba7a04b270d632cc4f9f11718a.zip frameworks_av-d7f77cd78f5180ba7a04b270d632cc4f9f11718a.tar.gz frameworks_av-d7f77cd78f5180ba7a04b270d632cc4f9f11718a.tar.bz2 | |
Merge "MediaCodec: Fix deallocated pointer reference when calling reset()" into lmp-dev
Diffstat (limited to 'include/media')
| -rw-r--r-- | include/media/stagefright/MediaCodec.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/media/stagefright/MediaCodec.h b/include/media/stagefright/MediaCodec.h index b87a09e..bca78b9 100644 --- a/include/media/stagefright/MediaCodec.h +++ b/include/media/stagefright/MediaCodec.h @@ -268,7 +268,7 @@ private: static void PostReplyWithError(int32_t replyID, int32_t err); - status_t init(const char *name, bool nameIsType, bool encoder); + status_t init(const AString &name, bool nameIsType, bool encoder); void setState(State newState); void returnBuffersToCodec(); |