Ticket #97: ticket97.patch

Lib/TLibCommon/TComDataCU.cpp

@@ -5791 +5791 @@
 #endif
     iScale = xGetDistScaleFactor( iCurrViewId, iCurrRefViewId, iColViewId, iColRefViewId );
 
+#if FIX_TICKET_97
+    if ( bMRG && iScale != 4096 && m_pcSlice->getIvMvScalingFlag( ) )
+#else
     if ( iScale != 4096 && m_pcSlice->getIvMvScalingFlag( ) )
+#endif
     {
       rcMv = cColMv.scaleMv( iScale );
     }

Lib/TLibCommon/TypeDef.h

@@ -325 +325 @@
 // Fixes
 
 #define FIX_TICKET_95                          1   // pps_scaling_list_ref_layer_id parsing
+#define FIX_TICKET_97                          1   // AMVP view-scaling removal (D0122 related)
 
 #if H_3D
 #define HHI_VIEW_ID_LIST_I5_J0107              0