Fix the compiling issues in gcc

source/App/Parcat/parcat.cpp

@@ -393,7 +393,13 @@ std::vector<uint8_t> filter_segment(const std::vector<uint8_t> & v, int idx, int
       idr_found = true;
     }
 
-    if( ( idx > 1 && ( nalu_type == NAL_UNIT_CODED_SLICE_IDR_W_RADL || nalu_type == NAL_UNIT_CODED_SLICE_IDR_N_LP ) ) || ( ( idx > 1 && !idr_found ) && ( nalu_type == NAL_UNIT_DPS || nalu_type == NAL_UNIT_VPS || nalu_type == NAL_UNIT_SPS || nalu_type == NAL_UNIT_PPS || nalu_type == NAL_UNIT_PREFIX_APS || nalu_type == NAL_UNIT_SUFFIX_APS || nalu_type == NAL_UNIT_PH || nalu_type == NAL_UNIT_ACCESS_UNIT_DELIMITER ) )
+    if( ( idx > 1 && ( nalu_type == NAL_UNIT_CODED_SLICE_IDR_W_RADL || nalu_type == NAL_UNIT_CODED_SLICE_IDR_N_LP ) ) || ( ( idx > 1 && !idr_found ) 
+#if JVET_Q0117_PARAMETER_SETS_CLEANUP
+      && ( nalu_type == NAL_UNIT_DCI
+#else
+      && ( nalu_type == NAL_UNIT_DPS
+#endif
+        || nalu_type == NAL_UNIT_VPS || nalu_type == NAL_UNIT_SPS || nalu_type == NAL_UNIT_PPS || nalu_type == NAL_UNIT_PREFIX_APS || nalu_type == NAL_UNIT_SUFFIX_APS || nalu_type == NAL_UNIT_PH || nalu_type == NAL_UNIT_ACCESS_UNIT_DELIMITER ) )
       || (nalu_type == NAL_UNIT_SUFFIX_SEI && skip_next_sei))
     {
     }

source/Lib/EncoderLib/EncLib.cpp

@@ -243,7 +243,6 @@ void EncLib::init( bool isFieldCoding, AUWriterIf* auWriterIf )
 
 =======
 #if JVET_Q0117_PARAMETER_SETS_CLEANUP
-  int dciId = getDCIEnabled() ? 1 : 0;
   xInitDCI(m_dci, sps0);
 #else
 >>>>>>> effa8e16... Commit Q0117. HLS clenup: DPS is changed to DCI