Commit 575b638d authored Feb 06, 2020 by Automerger Merge Worker

Merge "MPEG4Writer: Initialize mime to NULL in addSource" am: df82d62c am:...

Merge "MPEG4Writer: Initialize mime to NULL in addSource" am: df82d62c am: 4146a560 am: 81a568b4

Change-Id: I8dc93d79eaab0adb59e542839cbf830e373a6c6a

parents c552796b 81a568b4

media/libstagefright/MPEG4Writer.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -625,7 +625,7 @@ status_t MPEG4Writer::addSource(const sp<MediaSource> &source) {

		CHECK(source.get() != NULL);

		const char *mime;
		const char *mime = NULL;
		sp<MetaData> meta = source->getFormat();
		meta->findCString(kKeyMIMEType, &mime);