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/dec | |
| 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/dec')
| -rw-r--r-- | media/libstagefright/codecs/m4v_h263/dec/src/find_min_max.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/libstagefright/codecs/m4v_h263/dec/src/find_min_max.cpp b/media/libstagefright/codecs/m4v_h263/dec/src/find_min_max.cpp index a357ea6..1ac88a1 100644 --- a/media/libstagefright/codecs/m4v_h263/dec/src/find_min_max.cpp +++ b/media/libstagefright/codecs/m4v_h263/dec/src/find_min_max.cpp @@ -138,8 +138,8 @@ void FindMaxMin( /*---------------------------------------------------------------------------- ; Define all local variables ----------------------------------------------------------------------------*/ - register uint i, j; - register int min, max; + uint i, j; + int min, max; /*---------------------------------------------------------------------------- ; Function body here |