summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlessandro Astone <ales.astone@gmail.com>2019-09-08 01:36:27 +0200
committergabrielgagz <g.a.gomez@gmail.com>2019-10-22 19:53:05 -0300
commit09bc40392ee7b78f385093765146758c7472b546 (patch)
tree31a35ff5a1498abaf3e6343ba9d11f5ef4956022
parent2829c41c4516fe423c2692ef49d4b1ebf2e95f19 (diff)
downloadandroid_hardware_qcom_media-lineage-17.1-caf-apq8084.tar.gz
android_hardware_qcom_media-lineage-17.1-caf-apq8084.tar.bz2
android_hardware_qcom_media-lineage-17.1-caf-apq8084.zip
* C++17 defines std::byte, making references to 'byte' ambiguous * Replace instances of 'byte' by 'uint8' Change-Id: I0efc6bfcbe0e6710ae943941f5a3e1b2a8ac48b8
-rw-r--r--mm-video-v4l2/vidc/vdec/inc/mp4_utils.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/mm-video-v4l2/vidc/vdec/inc/mp4_utils.h b/mm-video-v4l2/vidc/vdec/inc/mp4_utils.h
index 93c04e75..ca42fd24 100644
--- a/mm-video-v4l2/vidc/vdec/inc/mp4_utils.h
+++ b/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