Merge branch 'fix_1177' into 'master'

Fix #1177: Fix computation of APS Id in checkAuApsContent()

See merge request !1785

source/Lib/CommonLib/ParameterSetManager.h

@@ -140,7 +140,7 @@ public:
 
   void checkAuApsContent( APS *aps, std::vector<int>& accessUnitApsNals )
   {
-    int apsId = aps->getAPSId() + MAX_NUM_APS * aps->getAPSType();
+    int apsId = ( aps->getAPSId() << NUM_APS_TYPE_LEN ) + aps->getAPSType();
 
     if( std::find( accessUnitApsNals.begin(), accessUnitApsNals.end(), apsId ) != accessUnitApsNals.end() )
     {