diff options
author | Jean-Baptiste Queru <jbq@google.com> | 2012-02-24 10:28:00 -0800 |
---|---|---|
committer | android code review <noreply-gerritcodereview@google.com> | 2012-02-24 10:28:01 -0800 |
commit | b86b3c8f976b70635770d93217132d4023ecf33f (patch) | |
tree | fb5d9e009c79d61d79d538dace3926108797c76d /media/libstagefright | |
parent | c6a8eec53535fcb074989b5966baec48628a6f94 (diff) | |
parent | 5e9afe434d8207fb0af6e191cca671ab74cfe878 (diff) | |
download | frameworks_av-b86b3c8f976b70635770d93217132d4023ecf33f.zip frameworks_av-b86b3c8f976b70635770d93217132d4023ecf33f.tar.gz frameworks_av-b86b3c8f976b70635770d93217132d4023ecf33f.tar.bz2 |
Merge "stagefright aacenc: Make the bits to write in WriteBits unsigned"
Diffstat (limited to 'media/libstagefright')
-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; |