commit 63b38e31aaea5a3e75c7bbe0c9e40e8bdb78ff73
author Andreas Huber <andih@google.com> Wed Jan 26 15:50:04 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jan 26 15:50:04 2011 -0800
tree 8c97fda7e7cee9f33f61a02f478544aca0cb2d86
parent 85433c76066843d20c92c90d64e842e4f14dbac8
parent 0f535afd7e177b9a133f3ef4d014042797b225ff

Merge "This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes." into honeycomb

media/libstagefright/rtsp/AMPEG4AudioAssembler.cpp

diff --git a/media/libstagefright/rtsp/AMPEG4AudioAssembler.cpp b/media/libstagefright/rtsp/AMPEG4AudioAssembler.cpp
index bbde516..8bfe285 100644
--- a/media/libstagefright/rtsp/AMPEG4AudioAssembler.cpp
+++ b/media/libstagefright/rtsp/AMPEG4AudioAssembler.cpp
@@ -359,7 +359,10 @@
         }
     }
 
-    CHECK_EQ(offset, buffer->size());
+    if (offset < buffer->size()) {
+        LOGI("ignoring %d bytes of trailing data", buffer->size() - offset);
+    }
+    CHECK_LE(offset, buffer->size());
 
     return out;
 }