diff options
| author | Andreas Huber <andih@google.com> | 2010-08-12 13:14:37 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-12 13:14:37 -0700 |
| commit | 3bf8c3427f4c728bb88e5e266b85c96e3e727203 (patch) | |
| tree | a546c9ea15d31cf085cc485411d1024bd62aa3e8 /media | |
| parent | 53895c6a0e8ecb4e835aab7eca7480779c224356 (diff) | |
| parent | ae3a1f45951aeb716e1f6b9a99a09838eb55dab4 (diff) | |
| download | frameworks_base-3bf8c3427f4c728bb88e5e266b85c96e3e727203.zip frameworks_base-3bf8c3427f4c728bb88e5e266b85c96e3e727203.tar.gz frameworks_base-3bf8c3427f4c728bb88e5e266b85c96e3e727203.tar.bz2 | |
am ae3a1f45: Merge "Fix the h.263 assembler to properly subset a buffer\'s range if it already has a range applied." into gingerbread
Merge commit 'ae3a1f45951aeb716e1f6b9a99a09838eb55dab4' into gingerbread-plus-aosp
* commit 'ae3a1f45951aeb716e1f6b9a99a09838eb55dab4':
Fix the h.263 assembler to properly subset a buffer's range if it already has a range applied.
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/rtsp/AH263Assembler.cpp | 2 | ||||
| -rw-r--r-- | media/libstagefright/rtsp/ARTPWriter.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/media/libstagefright/rtsp/AH263Assembler.cpp b/media/libstagefright/rtsp/AH263Assembler.cpp index 8b59998..2818041 100644 --- a/media/libstagefright/rtsp/AH263Assembler.cpp +++ b/media/libstagefright/rtsp/AH263Assembler.cpp @@ -110,7 +110,7 @@ ARTPAssembler::AssemblyStatus AH263Assembler::addPacket( buffer->data()[0] = 0x00; buffer->data()[1] = 0x00; } else { - buffer->setRange(2, buffer->size() - 2); + buffer->setRange(buffer->offset() + 2, buffer->size() - 2); } mPackets.push_back(buffer); diff --git a/media/libstagefright/rtsp/ARTPWriter.cpp b/media/libstagefright/rtsp/ARTPWriter.cpp index cc23856..d6dd597 100644 --- a/media/libstagefright/rtsp/ARTPWriter.cpp +++ b/media/libstagefright/rtsp/ARTPWriter.cpp @@ -43,7 +43,7 @@ ARTPWriter::ARTPWriter(int fd) #if 1 mRTPAddr.sin_addr.s_addr = INADDR_ANY; #else - mRTPAddr.sin_addr.s_addr = inet_addr("172.19.19.74"); + mRTPAddr.sin_addr.s_addr = inet_addr("172.19.18.246"); #endif mRTPAddr.sin_port = htons(5634); |