From 09bc40392ee7b78f385093765146758c7472b546 Mon Sep 17 00:00:00 2001 From: Alessandro Astone Date: Sun, 8 Sep 2019 01:36:27 +0200 Subject: media: drop byte typedef * C++17 defines std::byte, making references to 'byte' ambiguous * Replace instances of 'byte' by 'uint8' Change-Id: I0efc6bfcbe0e6710ae943941f5a3e1b2a8ac48b8 --- mm-video-v4l2/vidc/vdec/inc/mp4_utils.h | 3 +-- 1 file changed, 1 insertion(+), 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 -- cgit v1.2.3