extractor: More NULL checks...

This is blowing up if media unrecognized by ffmpeg goes through

Change-Id: Idfb2dcf581e3195f05772d375d315a6aedeab993

diff --git a/libstagefright/FFmpegExtractor/FFmpegExtractor.cpp b/libstagefright/FFmpegExtractor/FFmpegExtractor.cpp
index 7af3812..8094f1a 100644 (file)
--- a/libstagefright/FFmpegExtractor/FFmpegExtractor.cpp
+++ b/libstagefright/FFmpegExtractor/FFmpegExtractor.cpp
@@ -1791,7 +1791,8 @@ static const char *SniffFFMPEGCommon(const char *url, float *confidence, bool fa
 
        err = avformat_open_input(&ic, url, NULL, NULL);
 
-       if (ic->iformat != NULL &&
+       if (ic->iformat != NULL && ic->iformat->name != NULL &&
+               findMatchingContainer(ic->iformat->name) != NULL &&
                !strcasecmp(findMatchingContainer(ic->iformat->name),
                MEDIA_MIMETYPE_CONTAINER_MPEG4)) {
                if (fastMPEG4) {