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/avc/enc/src/findhalfpel.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/avc/enc/src/findhalfpel.cpp')
| -rw-r--r-- | media/libstagefright/codecs/avc/enc/src/findhalfpel.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libstagefright/codecs/avc/enc/src/findhalfpel.cpp b/media/libstagefright/codecs/avc/enc/src/findhalfpel.cpp index 16a1b08..0b8d9e2 100644 --- a/media/libstagefright/codecs/avc/enc/src/findhalfpel.cpp +++ b/media/libstagefright/codecs/avc/enc/src/findhalfpel.cpp @@ -151,7 +151,7 @@ void GenerateHalfPelPred(uint8* subpel_pred, uint8 *ncand, int lx) uint8 tmp8; int32 tmp32; int16 tmp_horz[18*22], *dst_16, *src_16; - register int a = 0, b = 0, c = 0, d = 0, e = 0, f = 0; // temp register + int a = 0, b = 0, c = 0, d = 0, e = 0, f = 0; // temp int i, j; /* first copy full-pel to the first array */ |