Changeset 1126 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibDecoder

Timestamp:

7 Jul 2015, 02:30:56 (10 years ago)

Author:

seregin

Message:

macro cleanup: O0223_PICTURE_TYPES_ALIGN_FLAG

File:

• branches/SHM-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp (modified) (2 diffs)

branches/SHM-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp

@@ -3660 +3660 @@
   UInt i,j;
   UInt uiCode;
-#if O0223_PICTURE_TYPES_ALIGN_FLAG
   READ_FLAG(uiCode, "cross_layer_pic_type_aligned_flag" );
   vps->setCrossLayerPictureTypeAlignFlag(uiCode);
   if (!uiCode) 
   {
-#endif
     READ_FLAG(uiCode, "cross_layer_irap_aligned_flag" );
     vps->setCrossLayerIrapAlignFlag(uiCode);
-#if O0223_PICTURE_TYPES_ALIGN_FLAG
   }
   else
@@ -3674 +3671 @@
     vps->setCrossLayerIrapAlignFlag(true);
   }
-#endif
+
 #if P0068_CROSS_LAYER_ALIGNED_IDR_ONLY_FOR_IRAP_FLAG
   if( uiCode )