Changeset 1386 in 3DVCSoftware for trunk/source/Lib/TLibEncoder/AnnexBwrite.h

Timestamp:

13 Nov 2015, 16:29:39 (8 years ago)

Author:

tech

Message:

Merged 15.1-dev1@1381.

File:

• trunk/source/Lib/TLibEncoder/AnnexBwrite.h (modified) (2 diffs)

trunk/source/Lib/TLibEncoder/AnnexBwrite.h

@@ -60 +60 @@
     UInt size = 0; /* size of annexB unit in bytes */
 
-    static const Char start_code_prefix[] = {0,0,0,1};
+    static const UChar start_code_prefix[] = {0,0,0,1};
     if (it == au.begin() || nalu.m_nalUnitType == NAL_UNIT_VPS || nalu.m_nalUnitType == NAL_UNIT_SPS || nalu.m_nalUnitType == NAL_UNIT_PPS)
     {
@@ -71 +71 @@
        *    7.4.1.2.3.
        */
-      out.write(start_code_prefix, 4);
+      out.write(reinterpret_cast<const TChar*>(start_code_prefix), 4);
       size += 4;
     }
     else
     {
-      out.write(start_code_prefix+1, 3);
+      out.write(reinterpret_cast<const TChar*>(start_code_prefix+1), 3);
       size += 3;
     }