diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h index e34f8cd35e26cb16baf09d8711bb51a82e878b4c..692348224adfad6bb1fe652016c8365bedc38d7f 100644 --- a/source/Lib/CommonLib/TypeDef.h +++ b/source/Lib/CommonLib/TypeDef.h @@ -1009,9 +1009,6 @@ enum NalUnitType NAL_UNIT_RESERVED_IRAP_VCL_11, NAL_UNIT_RESERVED_IRAP_VCL_12, -#if JVET_P0124_MIXED_NALU - NAL_UNIT_RESERVED_VCL_15, -#endif #if JVET_Q0117_PARAMETER_SETS_CLEANUP NAL_UNIT_DCI, // 13 #else diff --git a/source/Lib/DecoderLib/DecLib.cpp b/source/Lib/DecoderLib/DecLib.cpp index 56e44261c1da3563879f643d35e42a70a53e3eb7..228334a4802b2279fe06340f76275c943fe46a77 100644 --- a/source/Lib/DecoderLib/DecLib.cpp +++ b/source/Lib/DecoderLib/DecLib.cpp @@ -2797,7 +2797,7 @@ void DecLib::xCheckMixedNalUnit(Slice* pcSlice, SPS *sps, InputNALUnit &nalu) { num1stSetSlice++; } - else if ((naluType >= NAL_UNIT_CODED_SLICE_TRAIL && naluType <= NAL_UNIT_RESERVED_VCL_15) || naluType == NAL_UNIT_CODED_SLICE_GDR) + else if ((naluType >= NAL_UNIT_CODED_SLICE_TRAIL && naluType <= NAL_UNIT_RESERVED_VCL_6) || naluType == NAL_UNIT_CODED_SLICE_GDR) { num2ndSetSlice++; }