diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-02-24 11:11:10 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-02-24 11:11:10 -0800 |
| commit | 1e07b508b4f9d5031e17cde7701ad656824816f1 (patch) | |
| tree | 2c207a9751c76817678fc215461c5df7e1a3a356 /media | |
| parent | fc237e5453333c3e0a31da3562f26ca8639d7951 (diff) | |
| parent | 9a2af4508c27affc0e4a7440f8e5694ec3f0bec6 (diff) | |
| download | frameworks_av-1e07b508b4f9d5031e17cde7701ad656824816f1.zip frameworks_av-1e07b508b4f9d5031e17cde7701ad656824816f1.tar.gz frameworks_av-1e07b508b4f9d5031e17cde7701ad656824816f1.tar.bz2 | |
am ed7e1e83: am 47023027: am 26d9944e: am 6a300a54: Merge "stagefright aacenc: Make the bits to write in WriteBits unsigned"
* commit 'ed7e1e830165678421ee7d1b3dac044214a6e635':
stagefright aacenc: Make the bits to write in WriteBits unsigned
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/codecs/aacenc/inc/bitbuffer.h | 2 | ||||
| -rw-r--r-- | media/libstagefright/codecs/aacenc/src/bitbuffer.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/media/libstagefright/codecs/aacenc/inc/bitbuffer.h b/media/libstagefright/codecs/aacenc/inc/bitbuffer.h index e538064..7c79f07 100644 --- a/media/libstagefright/codecs/aacenc/inc/bitbuffer.h +++ b/media/libstagefright/codecs/aacenc/inc/bitbuffer.h @@ -76,7 +76,7 @@ Word16 GetBitsAvail(HANDLE_BIT_BUF hBitBuf); Word16 WriteBits(HANDLE_BIT_BUF hBitBuf, - Word32 writeValue, + UWord32 writeValue, Word16 noBitsToWrite); void ResetBitBuf(HANDLE_BIT_BUF hBitBuf, diff --git a/media/libstagefright/codecs/aacenc/src/bitbuffer.c b/media/libstagefright/codecs/aacenc/src/bitbuffer.c index 5615ac3..a706893 100644 --- a/media/libstagefright/codecs/aacenc/src/bitbuffer.c +++ b/media/libstagefright/codecs/aacenc/src/bitbuffer.c @@ -138,7 +138,7 @@ Word16 GetBitsAvail(HANDLE_BIT_BUF hBitBuf) * *****************************************************************************/ Word16 WriteBits(HANDLE_BIT_BUF hBitBuf, - Word32 writeValue, + UWord32 writeValue, Word16 noBitsToWrite) { Word16 wBitPos; |