diff options
| author | Andreas Huber <andih@google.com> | 2010-08-12 13:28:39 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-12 13:28:39 -0700 |
| commit | 08c96ec7f52e6951b949a68c9b1f4959c52ebed1 (patch) | |
| tree | cb64a35f872a167749c5355d002230ec8cb1c5fb | |
| parent | 53fb14ff8e0955ccc52b541dfbefce9d14881442 (diff) | |
| parent | 3bf8c3427f4c728bb88e5e266b85c96e3e727203 (diff) | |
| download | frameworks_base-08c96ec7f52e6951b949a68c9b1f4959c52ebed1.zip frameworks_base-08c96ec7f52e6951b949a68c9b1f4959c52ebed1.tar.gz frameworks_base-08c96ec7f52e6951b949a68c9b1f4959c52ebed1.tar.bz2 | |
am 3bf8c342: 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 '3bf8c3427f4c728bb88e5e266b85c96e3e727203'
* commit '3bf8c3427f4c728bb88e5e266b85c96e3e727203':
Fix the h.263 assembler to properly subset a buffer's range if it already has a range applied.
| -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); |