diff options
author | Lajos Molnar <lajos@google.com> | 2014-12-09 14:41:17 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-09 14:41:17 +0000 |
commit | 33cc5c91e4bb9152ed122afacf7423e085420ac8 (patch) | |
tree | ba4b32395614a947b40d9efe0cb6ff38600dc51f /media/libstagefright/codecs/m4v_h263/enc/src/dct.cpp | |
parent | 853bc5a2379a59859795027a9dd4bc11a54b2a5f (diff) | |
parent | f143b60856d275a9dcda1f3084c768655b242022 (diff) | |
download | frameworks_av-33cc5c91e4bb9152ed122afacf7423e085420ac8.zip frameworks_av-33cc5c91e4bb9152ed122afacf7423e085420ac8.tar.gz frameworks_av-33cc5c91e4bb9152ed122afacf7423e085420ac8.tar.bz2 |
am f143b608: am d1aeff55: Merge "Fix build with clang in C++11 mode"
* commit 'f143b60856d275a9dcda1f3084c768655b242022':
Fix build with clang in C++11 mode
Diffstat (limited to 'media/libstagefright/codecs/m4v_h263/enc/src/dct.cpp')
-rw-r--r-- | media/libstagefright/codecs/m4v_h263/enc/src/dct.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/media/libstagefright/codecs/m4v_h263/enc/src/dct.cpp b/media/libstagefright/codecs/m4v_h263/enc/src/dct.cpp index fa4ae23..8d7d9f1 100644 --- a/media/libstagefright/codecs/m4v_h263/enc/src/dct.cpp +++ b/media/libstagefright/codecs/m4v_h263/enc/src/dct.cpp @@ -267,7 +267,7 @@ extern "C" Void Block4x4DCT_AANwSub(Short *out, UChar *cur, UChar *pred, Int width) { Short *dst; - register Int k0, k1, k2, k3, k4, k5, k6, k7; + Int k0, k1, k2, k3, k4, k5, k6, k7; Int round; Int k12 = 0x022A02D4; Int k14 = 0x0188053A; @@ -473,7 +473,7 @@ extern "C" Void Block2x2DCT_AANwSub(Short *out, UChar *cur, UChar *pred, Int width) { Short *dst; - register Int k0, k1, k2, k3, k4, k5, k6, k7; + Int k0, k1, k2, k3, k4, k5, k6, k7; Int round; Int k12 = 0x022A02D4; Int k14 = 0x018803B2; @@ -863,7 +863,7 @@ extern "C" Void Block4x4DCT_AANIntra(Short *out, UChar *cur, UChar *dummy2, Int width) { Short *dst; - register Int k0, k1, k2, k3, k4, k5, k6, k7; + Int k0, k1, k2, k3, k4, k5, k6, k7; Int round; Int k12 = 0x022A02D4; Int k14 = 0x0188053A; @@ -1050,7 +1050,7 @@ extern "C" Void Block2x2DCT_AANIntra(Short *out, UChar *cur, UChar *dummy2, Int width) { Short *dst; - register Int k0, k1, k2, k3, k4, k5, k6, k7; + Int k0, k1, k2, k3, k4, k5, k6, k7; Int round; Int k12 = 0x022A02D4; Int k14 = 0x018803B2; |