diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-10-29 19:07:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-10-29 19:07:00 +0000 |
| commit | 42e122ed0b92bbc3deb8568e3c334a044847973a (patch) | |
| tree | 2b8106550c6d120d4f649e0e3b969815d176d0b3 | |
| parent | 071bbadda3ba684c2f595bc576800a4d894ea08a (diff) | |
| parent | 250da8c6a60b86799399e696b772f34d47266d21 (diff) | |
| download | libvpx-42e122ed0b92bbc3deb8568e3c334a044847973a.tar.gz | |
Merge "libvpx: cherry pick "register" removal"android-wear-8.0.0_r2android-o-mr1-iot-release-smart-display-r9android-o-mr1-iot-release-smart-display-r8android-o-mr1-iot-release-smart-display-r5android-o-mr1-iot-release-smart-display-r40.1Jandroid-o-mr1-iot-release-smart-display-r4android-o-mr1-iot-release-smart-display-r39android-o-mr1-iot-release-smart-display-r30android-o-mr1-iot-release-smart-display-r22android-o-mr1-iot-release-smart-display-r14android-o-mr1-iot-release-smart-clock-r6android-o-mr1-iot-release-smart-clock-r2android-o-mr1-iot-release-smart-clock-fsiandroid-o-mr1-iot-release-smart-clock-fcsandroid-o-mr1-iot-release-cube_r2android-o-mr1-iot-release-cube-fsiandroid-o-mr1-iot-release-cube-fcsandroid-n-iot-release-ihome-igv1nougat-iot-release
| -rw-r--r-- | README.version | 1 | ||||
| -rw-r--r-- | libvpx/md5_utils.c | 2 | ||||
| -rw-r--r-- | libvpx/vp8/decoder/treereader.h | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/README.version b/README.version index c6c6a3724..1aeb4e557 100644 --- a/README.version +++ b/README.version @@ -4,3 +4,4 @@ BugComponent: 42195 Owners: johannkoenig Local Modifications: Add visibility="protected" attribute for global variables referenced in asm files. + Remove "register" keyword from variables diff --git a/libvpx/md5_utils.c b/libvpx/md5_utils.c index 093798b83..9ddb104c8 100644 --- a/libvpx/md5_utils.c +++ b/libvpx/md5_utils.c @@ -163,7 +163,7 @@ void MD5Final(md5byte digest[16], struct MD5Context *ctx) { */ VPX_NO_UNSIGNED_OVERFLOW_CHECK void MD5Transform(UWORD32 buf[4], UWORD32 const in[16]) { - register UWORD32 a, b, c, d; + UWORD32 a, b, c, d; a = buf[0]; b = buf[1]; diff --git a/libvpx/vp8/decoder/treereader.h b/libvpx/vp8/decoder/treereader.h index dd0f0986e..fd622a493 100644 --- a/libvpx/vp8/decoder/treereader.h +++ b/libvpx/vp8/decoder/treereader.h @@ -30,7 +30,7 @@ typedef BOOL_DECODER vp8_reader; static INLINE int vp8_treed_read( vp8_reader *const r, /* !!! must return a 0 or 1 !!! */ vp8_tree t, const vp8_prob *const p) { - register vp8_tree_index i = 0; + vp8_tree_index i = 0; while ((i = t[i + vp8_read(r, p[i >> 1])]) > 0) { } |