diff options
| author | Andy Hung <hunga@google.com> | 2014-09-23 16:17:46 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-23 16:17:46 +0000 |
| commit | 1a65cb0463b4456cc1110135bab39e86b86a99ce (patch) | |
| tree | 7ce9fae4cf6ed603158a2dffc9aa8dbb32b8d98a /media/libstagefright/MediaCodec.cpp | |
| parent | d93ebc8aa9433678b36285f8d43dcbc00a8dd534 (diff) | |
| parent | d20940ee9e9da7495a75569ccc513b4aa3ddc179 (diff) | |
| download | frameworks_av-1a65cb0463b4456cc1110135bab39e86b86a99ce.zip frameworks_av-1a65cb0463b4456cc1110135bab39e86b86a99ce.tar.gz frameworks_av-1a65cb0463b4456cc1110135bab39e86b86a99ce.tar.bz2 | |
am d20940ee: am d7f77cd7: Merge "MediaCodec: Fix deallocated pointer reference when calling reset()" into lmp-dev
* commit 'd20940ee9e9da7495a75569ccc513b4aa3ddc179':
MediaCodec: Fix deallocated pointer reference when calling reset()
Diffstat (limited to 'media/libstagefright/MediaCodec.cpp')
| -rw-r--r-- | media/libstagefright/MediaCodec.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/media/libstagefright/MediaCodec.cpp b/media/libstagefright/MediaCodec.cpp index 9d6bb9a..0a42ebd 100644 --- a/media/libstagefright/MediaCodec.cpp +++ b/media/libstagefright/MediaCodec.cpp @@ -180,7 +180,7 @@ void MediaCodec::PostReplyWithError(int32_t replyID, int32_t err) { response->postReply(replyID); } -status_t MediaCodec::init(const char *name, bool nameIsType, bool encoder) { +status_t MediaCodec::init(const AString &name, bool nameIsType, bool encoder) { // save init parameters for reset mInitName = name; mInitNameIsType = nameIsType; @@ -201,7 +201,7 @@ status_t MediaCodec::init(const char *name, bool nameIsType, bool encoder) { } bool needDedicatedLooper = false; - if (nameIsType && !strncasecmp(name, "video/", 6)) { + if (nameIsType && !strncasecmp(name.c_str(), "video/", 6)) { needDedicatedLooper = true; } else { AString tmp = name; @@ -367,7 +367,7 @@ status_t MediaCodec::reset() { mHaveInputSurface = false; if (err == OK) { - err = init(mInitName.c_str(), mInitNameIsType, mInitIsEncoder); + err = init(mInitName, mInitNameIsType, mInitIsEncoder); } return err; } |