diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-08-08 13:15:41 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-08-08 13:15:41 -0700 |
| commit | d32a2c0a9a7b199046679510ba94ae7c44f1aaa7 (patch) | |
| tree | a2c1271e7ab472fc9f62dd379a251a8f25ec9f21 | |
| parent | 660def30bd7d431cb50a592823a49c4301957ad0 (diff) | |
| parent | 1a562740beb85b1a90fc7f44a7b86cd7f0862810 (diff) | |
| download | frameworks_av-d32a2c0a9a7b199046679510ba94ae7c44f1aaa7.zip frameworks_av-d32a2c0a9a7b199046679510ba94ae7c44f1aaa7.tar.gz frameworks_av-d32a2c0a9a7b199046679510ba94ae7c44f1aaa7.tar.bz2 | |
am 1a562740: am f5a66877: am 68d44b06: am 0ab18f85: Merge "avcenc: Remove useless casts"
* commit '1a562740beb85b1a90fc7f44a7b86cd7f0862810':
avcenc: Remove useless casts
| -rw-r--r-- | media/libstagefright/codecs/avc/enc/src/bitstream_io.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/libstagefright/codecs/avc/enc/src/bitstream_io.cpp b/media/libstagefright/codecs/avc/enc/src/bitstream_io.cpp index ed9fd8e..0e3037f 100644 --- a/media/libstagefright/codecs/avc/enc/src/bitstream_io.cpp +++ b/media/libstagefright/codecs/avc/enc/src/bitstream_io.cpp @@ -275,7 +275,7 @@ AVCEnc_Status AVCBitstreamUseOverrunBuffer(AVCEncBitstream* stream, int numExtra // allocate new overrun Buffer if (encvid->overrunBuffer) { - encvid->avcHandle->CBAVC_Free((uint32*)encvid->avcHandle->userData, + encvid->avcHandle->CBAVC_Free(encvid->avcHandle->userData, encvid->overrunBuffer); } @@ -314,7 +314,7 @@ AVCEnc_Status AVCBitstreamUseOverrunBuffer(AVCEncBitstream* stream, int numExtra // copy from the old buffer to new buffer memcpy(encvid->overrunBuffer, stream->overrunBuffer, stream->write_pos); // free old buffer - encvid->avcHandle->CBAVC_Free((uint32*)encvid->avcHandle->userData, + encvid->avcHandle->CBAVC_Free(encvid->avcHandle->userData, stream->overrunBuffer); // assign pointer to new buffer |