Merge branch 'Update/bug_fix_for_JVET_S0076' into 'master'

Fix parcat for JVET-S0076

See merge request !1776

source/App/Parcat/parcat.cpp

@@ -65,17 +65,30 @@ void ParcatHLSyntaxReader::parsePictureHeaderUpToPoc ( ParameterSetManager *para
   uint32_t  uiCode;
   PPS* pps = NULL;
   SPS* sps = NULL;
-  READ_FLAG(uiCode, "gdr_or_irap_pic_flag");
+  
+#if JVET_S0076_ASPECT1
+  uint32_t uiTmp;
+  READ_FLAG(uiTmp, "gdr_or_irap_pic_flag");
+  READ_FLAG(uiCode, "ph_non_ref_pic_flag");
+  if( uiTmp )
+  {
+    READ_FLAG( uiCode, "gdr_pic_flag" );
+  }
+#else
+  READ_FLAG( uiCode, "gdr_or_irap_pic_flag" );
   if (uiCode)
   {
     READ_FLAG(uiCode, "gdr_pic_flag");
   }
+#endif
   READ_FLAG(uiCode, "ph_inter_slice_allowed_flag");
   if (uiCode)
   {
     READ_FLAG(uiCode, "ph_intra_slice_allowed_flag");
   }
+#if !JVET_S0076_ASPECT1
   READ_FLAG(uiCode, "non_reference_picture_flag");
+#endif
   // parameter sets
   READ_UVLC(uiCode, "ph_pic_parameter_set_id");
   pps = parameterSetManager->getPPS(uiCode);