commit 68d44b061e92fb6832240457d4f683635bf5328f
author Jean-Baptiste Queru <jbq@google.com> Wed Aug 08 13:08:14 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Aug 08 13:08:14 2012 -0700
tree e4e70183ec1416704c27f689f644e789d5310c67
parent 4348cbcec6c3aec02af722d633ebda24f94dfcc8
parent 0ab18f853571149de700930fbb783ecd6b2c5582

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

* commit '0ab18f853571149de700930fbb783ecd6b2c5582':
  avcenc: Remove useless casts

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

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 @@
                 // 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 @@
             // 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