| commit | 81a568b40135f3a0c38f25a8fa8091bb9c0ac5cb | [log] [tgz] |
|---|---|---|
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Feb 06 21:32:58 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Feb 06 21:32:58 2020 +0000 |
| tree | 26946941cac8bd6eaecc0e9631003fbdb8a5dc8c | |
| parent | 58e1c1ce6f82454986730ffc48741d6bcb196e57 [diff] | |
| parent | 4146a5604623031a06ac50f514226b7984110e82 [diff] |
Merge "MPEG4Writer: Initialize mime to NULL in addSource" am: df82d62c33 am: 4146a56046 Change-Id: Ib94695bd6d4c829535c7418a223cbd427419c8eb
diff --git a/media/libstagefright/MPEG4Writer.cpp b/media/libstagefright/MPEG4Writer.cpp index 128ce8b..258bed8 100644 --- a/media/libstagefright/MPEG4Writer.cpp +++ b/media/libstagefright/MPEG4Writer.cpp
@@ -613,7 +613,7 @@ CHECK(source.get() != NULL); - const char *mime; + const char *mime = NULL; sp<MetaData> meta = source->getFormat(); meta->findCString(kKeyMIMEType, &mime);