Merge "Fix HEIF support" (fefee89e) · Commits · e / os / android_frameworks_av

media/libstagefright/MediaExtractor.cpp

+9 −11

Original line number	Diff line number	Diff line
		@@ -154,7 +154,6 @@ sp<MediaExtractor> MediaExtractor::CreateFromService(

		CreatorFunc creator = NULL;
		String8 tmp;
		if (mime == NULL) {
		float confidence;
		creator = sniff(source, &tmp, &confidence, &meta);
		if (!creator) {
		@@ -165,7 +164,6 @@ sp<MediaExtractor> MediaExtractor::CreateFromService(
		mime = tmp.string();
		ALOGV("Autodetected media content as '%s' with confidence %.2f",
		mime, confidence);
		}

		MediaExtractor *ret = creator(source, meta);