Fix resource leak in cached mpeg4 fast exit

And clean up formatting to match the rest of the file

Change-Id: I334640e3ceefbf2b0ff3d91f7493b02dc0c3359b

diff --git a/libstagefright/FFmpegExtractor/FFmpegExtractor.cpp b/libstagefright/FFmpegExtractor/FFmpegExtractor.cpp
index f320c92..7af3812 100644 (file)
--- a/libstagefright/FFmpegExtractor/FFmpegExtractor.cpp
+++ b/libstagefright/FFmpegExtractor/FFmpegExtractor.cpp
@@ -1791,11 +1791,14 @@ static const char *SniffFFMPEGCommon(const char *url, float *confidence, bool fa
 
        err = avformat_open_input(&ic, url, NULL, NULL);
 
-        if (ic->iformat != NULL && fastMPEG4 &&
-              !strcasecmp(findMatchingContainer(ic->iformat->name),
-                MEDIA_MIMETYPE_CONTAINER_MPEG4)) {
-            return MEDIA_MIMETYPE_CONTAINER_MPEG4;
-        }
+       if (ic->iformat != NULL &&
+               !strcasecmp(findMatchingContainer(ic->iformat->name),
+               MEDIA_MIMETYPE_CONTAINER_MPEG4)) {
+               if (fastMPEG4) {
+                       container = findMatchingContainer(ic->iformat->name);
+                       goto fail;
+               }
+       }
 
        if (err < 0) {
         ALOGE("%s: avformat_open_input failed, err:%s", url, av_err2str(err));