summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlessandro Astone <ales.astone@gmail.com>2019-09-08 01:36:27 +0200
committerMichael Bestas <mkbestas@lineageos.org>2019-12-11 20:03:59 +0200
commit261987cd6d779fa7ca814ee5d3df2241206063c1 (patch)
tree8a1af86bc860df85b75e73c136769a20c48a16b7
parentb6639b7980e9ae81801f75d3f857413787ba616f (diff)
downloadandroid_hardware_qcom_media-staging/lineage-17.0_merge-android-10.0.0_r9.tar.gz
android_hardware_qcom_media-staging/lineage-17.0_merge-android-10.0.0_r9.tar.bz2
android_hardware_qcom_media-staging/lineage-17.0_merge-android-10.0.0_r9.zip
* C++17 defines std::byte, making references to 'byte' ambiguous * Replace instances of 'byte' by 'uint8' Change-Id: I0efc6bfcbe0e6710ae943941f5a3e1b2a8ac48b8
-rwxr-xr-xmsm8974/mm-video-v4l2/vidc/vdec/inc/mp4_utils.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/msm8974/mm-video-v4l2/vidc/vdec/inc/mp4_utils.h b/msm8974/mm-video-v4l2/vidc/vdec/inc/mp4_utils.h
index 93c04e75..ca42fd24 100755
--- a/msm8974/mm-video-v4l2/vidc/vdec/inc/mp4_utils.h
+++ b/msm8974/mm-video-v4l2/vidc/vdec/inc/mp4_utils.h
@@ -38,7 +38,6 @@ typedef int int32; /* Signed 32 bit value */
typedef signed short int16; /* Signed 16 bit value */
typedef signed char int8; /* Signed 8 bit value */
-typedef unsigned char byte; /* Unsigned 8 bit value type. */
#define SIMPLE_PROFILE_LEVEL0 0x08
#define SIMPLE_PROFILE_LEVEL1 0x01
#define SIMPLE_PROFILE_LEVEL2 0x02
@@ -154,7 +153,7 @@ class MP4_Utils
};
posInfoType m_posInfo;
- byte *m_dataBeginPtr;
+ uint8 *m_dataBeginPtr;
unsigned int vop_time_resolution;
bool vop_time_found;
uint16 m_SrcWidth, m_SrcHeight; // Dimensions of the source clip