| commit | 575b638dfce9a3ecd2236f21cdec286040b41464 | [log] [tgz] |
|---|---|---|
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Feb 06 21:51:56 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Feb 06 21:51:56 2020 +0000 |
| tree | c494fd663fa1131598fa4cc0756f05f8756ab2f4 | |
| parent | c552796bc221c842fd865730777819d002045f6e [diff] | |
| parent | 81a568b40135f3a0c38f25a8fa8091bb9c0ac5cb [diff] |
Merge "MPEG4Writer: Initialize mime to NULL in addSource" am: df82d62c33 am: 4146a56046 am: 81a568b401 Change-Id: I8dc93d79eaab0adb59e542839cbf830e373a6c6a
diff --git a/media/libstagefright/MPEG4Writer.cpp b/media/libstagefright/MPEG4Writer.cpp index b29d5f8..dbbdd1b 100644 --- a/media/libstagefright/MPEG4Writer.cpp +++ b/media/libstagefright/MPEG4Writer.cpp
@@ -625,7 +625,7 @@ CHECK(source.get() != NULL); - const char *mime; + const char *mime = NULL; sp<MetaData> meta = source->getFormat(); meta->findCString(kKeyMIMEType, &mime);