diff options
| author | 2012-02-24 11:02:29 -0800 | |
|---|---|---|
| committer | 2012-02-24 11:02:29 -0800 | |
| commit | 26d9944e3f75123708ef0cfb158f48709348a361 (patch) | |
| tree | affe62cb5814f4f96c676afa796a6bc2d7a63aa9 | |
| parent | 2accfc110a71add56f5e4c35228e88dfa3024676 (diff) | |
| parent | 6a300a5413898ff8b728e77c5a23290cae60e9b5 (diff) | |
am 6a300a54: Merge "stagefright aacenc: Make the bits to write in WriteBits unsigned"
* commit '6a300a5413898ff8b728e77c5a23290cae60e9b5':
stagefright aacenc: Make the bits to write in WriteBits unsigned
| -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 e53806491ac6..7c79f07ec50a 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 5615ac3cd65c..a706893d54e9 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; |