Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
Andreas Huber
2010-08-12 13:14:37 -07:00
committed by Android Git Automerger
parent 53895c6a0e ae3a1f4595
commit 3bf8c3427f
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
media/libstagefright/rtsp/AH263Assembler.cpp
View File

@@ -110,7 +110,7 @@ ARTPAssembler::AssemblyStatus AH263Assembler::addPacket(
buffer->data()[0] = 0x00; buffer->data()[0] = 0x00;
buffer->data()[1] = 0x00; buffer->data()[1] = 0x00;
} else { } else {
buffer->setRange(2, buffer->size() - 2); buffer->setRange(buffer->offset() + 2, buffer->size() - 2);
} }
mPackets.push_back(buffer); mPackets.push_back(buffer);

2
media/libstagefright/rtsp/ARTPWriter.cpp
View File

@@ -43,7 +43,7 @@ ARTPWriter::ARTPWriter(int fd)
#if 1 #if 1
mRTPAddr.sin_addr.s_addr = INADDR_ANY; mRTPAddr.sin_addr.s_addr = INADDR_ANY;
#else #else
mRTPAddr.sin_addr.s_addr = inet_addr("172.19.19.74"); mRTPAddr.sin_addr.s_addr = inet_addr("172.19.18.246");
#endif #endif
mRTPAddr.sin_port = htons(5634); mRTPAddr.sin_port = htons(5634);