Ticket #941: fix_gdr_or_irap_flag.patch

source/Lib/EncoderLib/EncGOP.cpp

@@ -2158 +2158 @@
     }
     pcSlice->setTLayer(m_pcCfg->getGOPEntry(iGOPid).m_temporalId);
 
+    // Set the nal unit type
+    pcSlice->setNalUnitType(getNalUnitType(pocCurr, m_iLastIDR, isField));
 #if JVET_Q0819_PH_CHANGES
     // set two flags according to slice type presented in the picture
     if (pcSlice->getSliceType() != I_SLICE)
@@ -2170 +2172 @@
     }
     picHeader->setGdrOrIrapPicFlag(picHeader->getGdrPicFlag() || pcSlice->isIRAP());
 #endif
-    // Set the nal unit type
-    pcSlice->setNalUnitType(getNalUnitType(pocCurr, m_iLastIDR, isField));
 
     if (m_pcCfg->getEfficientFieldIRAPEnabled())
     {