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

Commit 68d44b06 authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by Android Git Automerger
Browse files

am 0ab18f85: Merge "avcenc: Remove useless casts" 

* commit '0ab18f85':
  avcenc: Remove useless casts
parents 4348cbce 0ab18f85

media/libstagefright/codecs/avc/enc/src/bitstream_io.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -275,7 +275,7 @@ AVCEnc_Status AVCBitstreamUseOverrunBuffer(AVCEncBitstream* stream, int numExtra 
                // allocate new overrun Buffer

                // allocate new overrun Buffer

                if (encvid->overrunBuffer)

                if (encvid->overrunBuffer)

                {

                {

                    encvid->avcHandle->CBAVC_Free((uint32*)encvid->avcHandle->userData,

                    encvid->avcHandle->CBAVC_Free(encvid->avcHandle->userData,

                                                  encvid->overrunBuffer);

                                                  encvid->overrunBuffer);

                }

                }
@@ -314,7 +314,7 @@ AVCEnc_Status AVCBitstreamUseOverrunBuffer(AVCEncBitstream* stream, int numExtra 
            // copy from the old buffer to new buffer

            // copy from the old buffer to new buffer

            memcpy(encvid->overrunBuffer, stream->overrunBuffer, stream->write_pos);

            memcpy(encvid->overrunBuffer, stream->overrunBuffer, stream->write_pos);

            // free old buffer

            // free old buffer

            encvid->avcHandle->CBAVC_Free((uint32*)encvid->avcHandle->userData,

            encvid->avcHandle->CBAVC_Free(encvid->avcHandle->userData,

                                          stream->overrunBuffer);

                                          stream->overrunBuffer);





            // assign pointer to new buffer

            // assign pointer to new buffer