diff options
| author | Narayan Kamath <narayan@google.com> | 2014-03-07 02:26:36 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-07 02:26:36 +0000 |
| commit | e857b65c1d3aa055281cb48f59c9b5eb4a062dd0 (patch) | |
| tree | 9d0780a2aebbb8839ec74fe16b1b868e6d45e3e9 /media/libstagefright/codecs/m4v_h263/enc/src/dct.cpp | |
| parent | ce9be73c7e7f379d68e1a0d0210a6f7b9418269f (diff) | |
| parent | 3c9130a8a12ce962dc8d22e04243b135b9e98b01 (diff) | |
| download | frameworks_av-e857b65c1d3aa055281cb48f59c9b5eb4a062dd0.zip frameworks_av-e857b65c1d3aa055281cb48f59c9b5eb4a062dd0.tar.gz frameworks_av-e857b65c1d3aa055281cb48f59c9b5eb4a062dd0.tar.bz2 | |
am 3c9130a8: Merge "Make frameworks/av 64-bit compatible"
* commit '3c9130a8a12ce962dc8d22e04243b135b9e98b01':
Make frameworks/av 64-bit compatible
Diffstat (limited to 'media/libstagefright/codecs/m4v_h263/enc/src/dct.cpp')
| -rw-r--r-- | media/libstagefright/codecs/m4v_h263/enc/src/dct.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/media/libstagefright/codecs/m4v_h263/enc/src/dct.cpp b/media/libstagefright/codecs/m4v_h263/enc/src/dct.cpp index fa50eeb..fa4ae23 100644 --- a/media/libstagefright/codecs/m4v_h263/enc/src/dct.cpp +++ b/media/libstagefright/codecs/m4v_h263/enc/src/dct.cpp @@ -250,7 +250,7 @@ extern "C" out[40] = k4 ; /* row 5 */ out++; } - while ((UInt)out < (UInt)dst) ; + while ((uintptr_t)out < (uintptr_t)dst) ; return ; } @@ -455,7 +455,7 @@ extern "C" out[8] = k5 ; /* row 1 */ out++; } - while ((UInt)out < (UInt)dst) ; + while ((uintptr_t)out < (uintptr_t)dst) ; return ; } @@ -635,7 +635,7 @@ extern "C" out[8] = k5 ; /* row 1 */ out++; } - while ((UInt)out < (UInt)dst) ; + while ((uintptr_t)out < (uintptr_t)dst) ; return ; } @@ -846,7 +846,7 @@ extern "C" out[40] = k4 ; /* row 5 */ out++; } - while ((UInt)out < (UInt)dst) ; + while ((uintptr_t)out < (uintptr_t)dst) ; return ; } @@ -1033,7 +1033,7 @@ extern "C" out[8] = k5 ; /* row 1 */ out++; } - while ((UInt)out < (UInt)dst) ; + while ((uintptr_t)out < (uintptr_t)dst) ; return ; } @@ -1195,7 +1195,7 @@ extern "C" out[8] = k5 ; /* row 1 */ out++; } - while ((UInt)out < (UInt)dst) ; + while ((uintptr_t)out < (uintptr_t)dst) ; return ; } |