Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ae3a1f45 authored by Andreas Huber's avatar Andreas Huber Committed by Android (Google) Code Review
Browse files

Merge "Fix the h.263 assembler to properly subset a buffer's range if it... 

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

media/libstagefright/rtsp/AH263Assembler.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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);

media/libstagefright/rtsp/ARTPWriter.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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);