Index: branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibDecoder/TDecCAVLC.cpp
===================================================================
--- branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibDecoder/TDecCAVLC.cpp	(revision 648)
+++ branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibDecoder/TDecCAVLC.cpp	(revision 649)
@@ -796,4 +796,6 @@
   }
 }
+
+#if H_MV
 Void TDecCavlc::parseSPSExtension( TComSPS* pcSPS )
 {
@@ -838,4 +840,5 @@
   pcSPS->initCamParaSPS( viewIndex, uiCamParPrecision, bCamParSlice, m_aaiTempScale, m_aaiTempOffset ); 
 }
+#endif
 #endif
 
Index: branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibEncoder/TEncSlice.cpp
===================================================================
--- branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibEncoder/TEncSlice.cpp	(revision 648)
+++ branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibEncoder/TEncSlice.cpp	(revision 649)
@@ -198,4 +198,5 @@
   rpcSlice = pcPic->getSlice(0);
 
+#if H_MV
   rpcSlice->setVPS( pVPS ); 
 
@@ -205,4 +206,5 @@
 #if H_3D
   rpcSlice->setIsDepth     ( pVPS->getDepthId     ( layerId ) != 0 );    
+#endif
 #endif
   rpcSlice->setSPS( pSPS );