am 25bad49c: am 852dc963: Merge "avc_util: try to find the first start code prefix 0x000001 even though there is non-zero byte at the beginning of the buffer." into lmp-mr1-dev

* commit '25bad49ce75758b2f68b278f54d7272b1cf4d08c':
  avc_util: try to find the first start code prefix 0x000001 even though there is non-zero byte at the beginning of the buffer.

1 files changed, 3 insertions, 2 deletions

diff --git a/media/libstagefright/mpeg2ts/ESQueue.cpp b/media/libstagefright/mpeg2ts/ESQueue.cpp
index 6662569..73fe109 100644
--- a/media/libstagefright/mpeg2ts/ESQueue.cpp
+++ b/media/libstagefright/mpeg2ts/ESQueue.cpp
@@ -343,12 +343,13 @@ status_t ElementaryStreamQueue::appendData(
                 }
 
                 if (frameLength != size - startOffset) {
-                    ALOGW("got ADTS AAC frame length %zd instead of %zd",
+                    ALOGW("First ADTS AAC frame length is %zd bytes, "
+                          "while the buffer size is %zd bytes.",
                           frameLength, size - startOffset);
                 }
 
                 data = &ptr[startOffset];
-                size = frameLength;
+                size -= startOffset;
 #endif
                 break;
             }