summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/codecs/m4v_h263/dec
diff options
context:
space:
mode:
authorBernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>2014-11-27 12:08:59 +0100
committerBernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>2014-11-27 12:17:40 +0100
commit2d0ac425564ff9882ebaac5267d1a04d4af67d00 (patch)
tree0233791a817ab812f63e4731adf36f03d4dd4dd2 /media/libstagefright/codecs/m4v_h263/dec
parent1a9c3954a20800dda3d6d18048c7f0edc8c53e6a (diff)
downloadframeworks_av-2d0ac425564ff9882ebaac5267d1a04d4af67d00.zip
frameworks_av-2d0ac425564ff9882ebaac5267d1a04d4af67d00.tar.gz
frameworks_av-2d0ac425564ff9882ebaac5267d1a04d4af67d00.tar.bz2
Fix build with clang in C++11 mode
This removes the deprecated register keyword in many places, fixes one instance of passing '\0' where a char* is expected, and 2 switch type narrowing issues. Change-Id: Ie265ac26ff6a61267ad6406dfe237226d97ca9ac Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
Diffstat (limited to 'media/libstagefright/codecs/m4v_h263/dec')
-rw-r--r--media/libstagefright/codecs/m4v_h263/dec/src/find_min_max.cpp4
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