From c7510f37d56c73b30cf04ffde1792d299fc6ea97 Mon Sep 17 00:00:00 2001
From: Michael Chen <omxcodec@gmail.com>
Date: Sat, 31 Aug 2013 23:44:04 +0800
Subject: [PATCH] fix crash

---
 libstagefright/FFmpegExtractor/FFmpegExtractor.cpp | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/libstagefright/FFmpegExtractor/FFmpegExtractor.cpp b/libstagefright/FFmpegExtractor/FFmpegExtractor.cpp
index 7734903..2e1a0dd 100644
--- a/libstagefright/FFmpegExtractor/FFmpegExtractor.cpp
+++ b/libstagefright/FFmpegExtractor/FFmpegExtractor.cpp
@@ -1570,8 +1570,8 @@ retry:
                     status = ERROR_MALFORMED;
                     break;
                 }
-		dst += mNALLengthSize;
-		ptr += mNALLengthSize;
+				dst += mNALLengthSize;
+				ptr += mNALLengthSize;
                 len -= mNALLengthSize;
 
                 memcpy(dst, ptr, nal_len);
@@ -1715,7 +1715,9 @@ static const char *LegacySniffFFMPEG(const char *uri, float *confidence)
         }
     }
 
-	adjustConfidenceIfNeeded(container, ic, confidence);
+	if (container) {
+		adjustConfidenceIfNeeded(container, ic, confidence);
+	}
 
     avformat_close_input(&ic);
     av_free(ic);
@@ -1770,7 +1772,9 @@ static const char *BetterSniffFFMPEG(const sp<DataSource> &source, float *confid
         }
     }
 
-	adjustConfidenceIfNeeded(container, ic, confidence);
+	if (container) {
+		adjustConfidenceIfNeeded(container, ic, confidence);
+	}
 
     avformat_close_input(&ic);
     av_free(ic);
-- 
2.11.0