Index: branches/SHM-dev/source/Lib/TLibCommon/SEI.cpp
===================================================================
--- branches/SHM-dev/source/Lib/TLibCommon/SEI.cpp	(revision 1474)
+++ branches/SHM-dev/source/Lib/TLibCommon/SEI.cpp	(revision 1475)
@@ -149,7 +149,5 @@
     case SEI::TEMP_MOTION_CONSTRAINED_TILE_SETS:    return "Temporal motion constrained tile sets";
     case SEI::CHROMA_RESAMPLING_FILTER_HINT:        return "Chroma sampling filter hint";
-#if Q0074_COLOUR_REMAPPING_SEI
     case SEI::COLOUR_REMAPPING_INFO:                return "Colour remapping info";
-#endif
 #if SVC_EXTENSION
 #if LAYERS_NOT_PRESENT_SEI
@@ -183,5 +181,4 @@
 }
 
-
 #if SUB_BITSTREAM_PROPERTY_SEI
 SEISubBitstreamProperty::SEISubBitstreamProperty()
Index: branches/SHM-dev/source/Lib/TLibCommon/SEI.h
===================================================================
--- branches/SHM-dev/source/Lib/TLibCommon/SEI.h	(revision 1474)
+++ branches/SHM-dev/source/Lib/TLibCommon/SEI.h	(revision 1475)
@@ -91,7 +91,5 @@
     CHROMA_RESAMPLING_FILTER_HINT        = 140,
     KNEE_FUNCTION_INFO                   = 141,
-#if Q0074_COLOUR_REMAPPING_SEI
     COLOUR_REMAPPING_INFO                = 142,
-#endif
 #if LAYERS_NOT_PRESENT_SEI
     LAYERS_NOT_PRESENT                   = 160,
@@ -459,5 +457,4 @@
 };
 
-#if Q0074_COLOUR_REMAPPING_SEI
 class SEIColourRemappingInfo : public SEI
 {
@@ -501,5 +498,4 @@
   std::vector<CRIlut> m_postLut[3];
 };
-#endif
 
 class SEIChromaResamplingFilterHint : public SEI
Index: branches/SHM-dev/source/Lib/TLibCommon/TypeDef.h
===================================================================
--- branches/SHM-dev/source/Lib/TLibCommon/TypeDef.h	(revision 1474)
+++ branches/SHM-dev/source/Lib/TLibCommon/TypeDef.h	(revision 1475)
@@ -165,5 +165,4 @@
 #define T0196_SELECTIVE_RDOQ                              1 ///< selective RDOQ
 #define U0040_MODIFIED_WEIGHTEDPREDICTION_WITH_BIPRED_AND_CLIPPING 1
-#define Q0074_COLOUR_REMAPPING_SEI                        1      ///< JCTVC-Q0074, JCTVC-R0344: SEI Colour Remapping Information
 
 // ====================================================================================================================
@@ -378,5 +377,4 @@
 };
 
-#if Q0074_COLOUR_REMAPPING_SEI
 enum MATRIX_COEFFICIENTS // Table E.5 (Matrix coefficients)
 {
@@ -393,5 +391,4 @@
   MATRIX_COEFFICIENTS_BT2020_CONSTANT_LUMINANCE     = 10,
 };
-#endif
 
 enum DeblockEdgeDir
Index: branches/SHM-dev/source/Lib/TLibDecoder/SEIread.cpp
===================================================================
--- branches/SHM-dev/source/Lib/TLibDecoder/SEIread.cpp	(revision 1474)
+++ branches/SHM-dev/source/Lib/TLibDecoder/SEIread.cpp	(revision 1475)
@@ -308,10 +308,8 @@
       xParseSEIKneeFunctionInfo((SEIKneeFunctionInfo&) *sei, payloadSize, pDecodedMessageOutputStream);
       break;
-#if Q0074_COLOUR_REMAPPING_SEI
     case SEI::COLOUR_REMAPPING_INFO:
       sei = new SEIColourRemappingInfo;
       xParseSEIColourRemappingInfo((SEIColourRemappingInfo&) *sei, payloadSize, pDecodedMessageOutputStream);
       break;
-#endif
     case SEI::MASTERING_DISPLAY_COLOUR_VOLUME:
       sei = new SEIMasteringDisplayColourVolume;
@@ -1335,5 +1333,4 @@
 }
 
-#if Q0074_COLOUR_REMAPPING_SEI
 Void SEIReader::xParseSEIColourRemappingInfo(SEIColourRemappingInfo& sei, UInt payloadSize, std::ostream *pDecodedMessageOutputStream)
 {
@@ -1424,5 +1421,4 @@
   }
 }
-#endif
 
 Void SEIReader::xParseSEIMasteringDisplayColourVolume(SEIMasteringDisplayColourVolume& sei, UInt payloadSize, std::ostream *pDecodedMessageOutputStream)
Index: branches/SHM-dev/source/Lib/TLibDecoder/SEIread.h
===================================================================
--- branches/SHM-dev/source/Lib/TLibDecoder/SEIread.h	(revision 1474)
+++ branches/SHM-dev/source/Lib/TLibDecoder/SEIread.h	(revision 1475)
@@ -108,7 +108,5 @@
   Void xParseSEIKneeFunctionInfo              (SEIKneeFunctionInfo& sei,              UInt payloadSize,                     std::ostream *pDecodedMessageOutputStream);
   Void xParseSEIMasteringDisplayColourVolume  (SEIMasteringDisplayColourVolume& sei,  UInt payloadSize,                     std::ostream *pDecodedMessageOutputStream);
-#if Q0074_COLOUR_REMAPPING_SEI
   Void xParseSEIColourRemappingInfo           (SEIColourRemappingInfo& sei,           UInt payloadSize,                     std::ostream *pDecodedMessageOutputStream);
-#endif
 
   Void sei_read_code(std::ostream *pOS, UInt uiLength, UInt& ruiCode, const TChar *pSymbolName);
Index: branches/SHM-dev/source/Lib/TLibEncoder/SEIEncoder.cpp
===================================================================
--- branches/SHM-dev/source/Lib/TLibEncoder/SEIEncoder.cpp	(revision 1474)
+++ branches/SHM-dev/source/Lib/TLibEncoder/SEIEncoder.cpp	(revision 1475)
@@ -421,5 +421,4 @@
 }
 
-#if Q0074_COLOUR_REMAPPING_SEI
 template <typename T>
 static Void readTokenValue(T            &returnedValue, /// value returned
@@ -593,5 +592,4 @@
   return true;
 }
-#endif
 
 Void SEIEncoder::initSEIChromaResamplingFilterHint(SEIChromaResamplingFilterHint *seiChromaResamplingFilterHint, Int iHorFilterIndex, Int iVerFilterIndex)
Index: branches/SHM-dev/source/Lib/TLibEncoder/SEIEncoder.h
===================================================================
--- branches/SHM-dev/source/Lib/TLibEncoder/SEIEncoder.h	(revision 1474)
+++ branches/SHM-dev/source/Lib/TLibEncoder/SEIEncoder.h	(revision 1475)
@@ -81,7 +81,5 @@
   Void initSEIChromaResamplingFilterHint(SEIChromaResamplingFilterHint *sei, Int iHorFilterIndex, Int iVerFilterIndex);
   Void initSEITimeCode(SEITimeCode *sei);
-#if Q0074_COLOUR_REMAPPING_SEI
   Bool initSEIColourRemappingInfo(SEIColourRemappingInfo *sei, Int currPOC); // returns true on success, false on failure.
-#endif
 
 #if LAYERS_NOT_PRESENT_SEI
Index: branches/SHM-dev/source/Lib/TLibEncoder/SEIwrite.cpp
===================================================================
--- branches/SHM-dev/source/Lib/TLibEncoder/SEIwrite.cpp	(revision 1474)
+++ branches/SHM-dev/source/Lib/TLibEncoder/SEIwrite.cpp	(revision 1475)
@@ -152,9 +152,7 @@
     xWriteSEIKneeFunctionInfo(*static_cast<const SEIKneeFunctionInfo*>(&sei));
     break;
-#if Q0074_COLOUR_REMAPPING_SEI
   case SEI::COLOUR_REMAPPING_INFO:
     xWriteSEIColourRemappingInfo(*static_cast<const SEIColourRemappingInfo*>(&sei));
     break;
-#endif
   case SEI::MASTERING_DISPLAY_COLOUR_VOLUME:
     xWriteSEIMasteringDisplayColourVolume(*static_cast<const SEIMasteringDisplayColourVolume*>(&sei));
@@ -987,5 +985,4 @@
 }
 
-#if Q0074_COLOUR_REMAPPING_SEI
 Void SEIWriter::xWriteSEIColourRemappingInfo(const SEIColourRemappingInfo& sei)
 {
@@ -1044,5 +1041,4 @@
   }
 }
-#endif
 
 Void SEIWriter::xWriteSEIMasteringDisplayColourVolume(const SEIMasteringDisplayColourVolume& sei)
Index: branches/SHM-dev/source/Lib/TLibEncoder/SEIwrite.h
===================================================================
--- branches/SHM-dev/source/Lib/TLibEncoder/SEIwrite.h	(revision 1474)
+++ branches/SHM-dev/source/Lib/TLibEncoder/SEIwrite.h	(revision 1475)
@@ -89,7 +89,5 @@
   Void xWriteSEIChromaResamplingFilterHint(const SEIChromaResamplingFilterHint& sei);
   Void xWriteSEIKneeFunctionInfo(const SEIKneeFunctionInfo &sei);
-#if Q0074_COLOUR_REMAPPING_SEI
   Void xWriteSEIColourRemappingInfo(const SEIColourRemappingInfo& sei);
-#endif
   Void xWriteSEIMasteringDisplayColourVolume( const SEIMasteringDisplayColourVolume& sei);
 
Index: branches/SHM-dev/source/Lib/TLibEncoder/TEncCfg.h
===================================================================
--- branches/SHM-dev/source/Lib/TLibEncoder/TEncCfg.h	(revision 1474)
+++ branches/SHM-dev/source/Lib/TLibEncoder/TEncCfg.h	(revision 1475)
@@ -321,7 +321,5 @@
   Int*      m_kneeSEIInputKneePoint;
   Int*      m_kneeSEIOutputKneePoint;
-#if Q0074_COLOUR_REMAPPING_SEI
   std::string m_colourRemapSEIFileRoot;          ///< SEI Colour Remapping File (initialized from external file)
-#endif
   TComSEIMasteringDisplay m_masteringDisplay;
   //====== Weighted Prediction ========
@@ -486,7 +484,4 @@
 #endif
 #endif //SVC_EXTENSION
-#if Q0074_COLOUR_REMAPPING_SEI
-  string                              m_colourRemapSEIFileName;          ///< SEI Colour Remapping File (initialized from external file)
-#endif
 
 public:
@@ -494,7 +489,4 @@
   : m_tileColumnWidth()
   , m_tileRowHeight()
-#if Q0074_COLOUR_REMAPPING_SEI
-  , m_colourRemapSEIFileName()
-#endif
   {
     m_PCMBitDepth[CHANNEL_TYPE_LUMA]=8;
@@ -910,8 +902,6 @@
   Void  setKneeSEIOutputKneePoint(Int *p)                            { m_kneeSEIOutputKneePoint = p; }
   Int*  getKneeSEIOutputKneePoint()                                  { return m_kneeSEIOutputKneePoint; }
-#if Q0074_COLOUR_REMAPPING_SEI
   Void  setColourRemapInfoSEIFileRoot( const std::string &s )        { m_colourRemapSEIFileRoot = s; }
   const std::string &getColourRemapInfoSEIFileRoot() const           { return m_colourRemapSEIFileRoot; }
-#endif
   Void  setMasteringDisplaySEI(const TComSEIMasteringDisplay &src)   { m_masteringDisplay = src; }
   const TComSEIMasteringDisplay &getMasteringDisplaySEI() const      { return m_masteringDisplay; }
Index: branches/SHM-dev/source/Lib/TLibEncoder/TEncGOP.cpp
===================================================================
--- branches/SHM-dev/source/Lib/TLibEncoder/TEncGOP.cpp	(revision 1474)
+++ branches/SHM-dev/source/Lib/TLibEncoder/TEncGOP.cpp	(revision 1475)
@@ -750,5 +750,4 @@
   }
 
-#if Q0074_COLOUR_REMAPPING_SEI
   // insert one Colour Remapping Info SEI for the picture (if the file exists)
   if (!m_pcCfg->getColourRemapInfoSEIFileRoot().empty())
@@ -766,5 +765,4 @@
     }
   }
-#endif
 
 #if Q0189_TMVP_CONSTRAINTS
