commit d6831054e0c6995749ccc09e8241a478ccadb9c8
author Andreas Huber <andih@google.com> Wed Aug 18 10:10:14 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Aug 18 10:10:14 2010 -0700
tree d5a1764a36f6b922e47e190ef20d427836df4aba
parent a65ccbff6e8eb301c0d325b2ec080aeda8df2024
parent 3e8843e8db702c8c9c97df2b4a31b66ea12961e6

Merge "Make the OggExtractor less verbose." into gingerbread

media/libstagefright/MPEG4Extractor.cpp

diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp
index 6af3a7f..12a1e6e 100644
--- a/media/libstagefright/MPEG4Extractor.cpp
+++ b/media/libstagefright/MPEG4Extractor.cpp
@@ -1273,6 +1273,14 @@
     hexdump(csd, csd_size);
 #endif
 
+    if (csd_size == 0) {
+        // There's no further information, i.e. no codec specific data
+        // Let's assume that the information provided in the mpeg4 headers
+        // is accurate and hope for the best.
+
+        return OK;
+    }
+
     if (csd_size < 2) {
         return ERROR_MALFORMED;
     }