Commit 0152b334 authored Jan 26, 2011 by Andreas Huber Committed by Android Git Automerger Jan 26, 2011

am 63b38e31: Merge "This particular RTSP server streams MPEG4-LATM audio with...

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

* commit '63b38e31aaea5a3e75c7bbe0c9e40e8bdb78ff73':
  This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes.

parents 84d3a304 8ce64ddc

media/libstagefright/rtsp/AMPEG4AudioAssembler.cpp

+4 −1

Original line number	Diff line number	Diff line
		@@ -359,7 +359,10 @@ sp<ABuffer> AMPEG4AudioAssembler::removeLATMFraming(const sp<ABuffer> &buffer) {
		}
		}

		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;
		}