Changeset 1386 in 3DVCSoftware for trunk/source/Lib/TLibCommon/TComBitStream.cpp


Ignore:
Timestamp:
13 Nov 2015, 16:29:39 (9 years ago)
Author:
tech
Message:

Merged 15.1-dev1@1381.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/source/Lib/TLibCommon/TComBitStream.cpp

    r1321 r1386  
    9393}
    9494
    95 Char* TComOutputBitstream::getByteStream() const
    96 {
    97   return (Char*) &m_fifo.front();
     95UChar* TComOutputBitstream::getByteStream() const
     96{
     97  return (UChar*) &m_fifo.front();
    9898}
    9999
     
    260260  m_numBitsRead += uiNumberOfBits;
    261261
    262 #if ENC_DEC_TRACE && H_MV_ENC_DEC_TRAC
     262#if ENC_DEC_TRACE && NH_MV_ENC_DEC_TRAC
    263263  if ( g_traceBitsRead )
    264264  {
Note: See TracChangeset for help on using the changeset viewer.