commit ae3a1f45951aeb716e1f6b9a99a09838eb55dab4
author Andreas Huber <andih@google.com> Thu Aug 12 11:02:17 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Aug 12 11:02:17 2010 -0700
tree 9447e567590ac3137be48c22ab72f92d2b53aa28
parent 66aa0f3d950f7f842327b47592baa920e855925c
parent 00237b79a031e95073f7f9ee8f7c022e149a4f3b

Merge "Fix the h.263 assembler to properly subset a buffer's range if it already has a range applied." into gingerbread

media/libstagefright/rtsp/AH263Assembler.cpp

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 @@
         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);

media/libstagefright/rtsp/ARTPWriter.cpp

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 @@
 #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);