Index: branches/SHM-upgrade/source/Lib/TLibCommon/TypeDef.h
===================================================================
--- branches/SHM-upgrade/source/Lib/TLibCommon/TypeDef.h	(revision 916)
+++ branches/SHM-upgrade/source/Lib/TLibCommon/TypeDef.h	(revision 917)
@@ -228,5 +228,4 @@
 
 #define Q0195_REP_FORMAT_CLEANUP         1      ///< JCTVC-Q0195: restructureing of rep_format() signaling
-#define REP_FORMAT_FIX                   1      ///< update_rep_format_flag should be inferred to be equal to 0
 
 #define R0156_CONF_WINDOW_IN_REP_FORMAT  O0096_REP_FORMAT_INDEX ///< JCTVC-R0156: add conformance window cropping offsets to rep_format()
@@ -296,6 +295,4 @@
 };
 
-#define WPP_FIX                          1
-
 /// normative encoder constraints --------
 #define MFM_ENCCONSTRAINT                1      ///< JCTVC-O0216: Encoder constraint for motion field mapping
@@ -313,5 +310,4 @@
 
 /// SEI messages -------------------------
-#define P0050_KNEE_FUNCTION_SEI          1      ///< JCTVC-P0050: Knee function SEI
 #define SUB_BITSTREAM_PROPERTY_SEI       1      ///< JCTVC-P0204: Sub-bitstream property SEI message
 #if SUB_BITSTREAM_PROPERTY_SEI
Index: branches/SHM-upgrade/source/Lib/TLibEncoder/TEncAnalyze.h
===================================================================
--- branches/SHM-upgrade/source/Lib/TLibEncoder/TEncAnalyze.h	(revision 916)
+++ branches/SHM-upgrade/source/Lib/TLibEncoder/TEncAnalyze.h	(revision 917)
@@ -165,4 +165,8 @@
         if (printMSEBasedSNR)
         {
+#if SVC_EXTENSION
+          if( layer == 0 )
+          {
+#endif
           printf( "         \tTotal Frames |   "   "Bitrate     "  "Y-PSNR" );
 
@@ -171,5 +175,13 @@
 
           //printf( "\t------------ "  " ----------"   " -------- "  " -------- "  " --------\n" );
+#if SVC_EXTENSION
+          }
+
+          printf( "Average:  L%d \t %8d    %c "          "%12.4lf  "    "%8.4lf",
+                 layer,
+
+#else
           printf( "Average: \t %8d    %c "          "%12.4lf  "    "%8.4lf",
+#endif
                  getNumPic(), cDelim,
                  getBits() * dScale,
@@ -182,5 +194,10 @@
           else printf("\n");
 
+#if SVC_EXTENSION
+          printf( "From MSE:  L%d \t %8d    %c "          "%12.4lf  "    "%8.4lf\n",
+                 layer,
+#else
           printf( "From MSE:\t %8d    %c "          "%12.4lf  "    "%8.4lf\n",
+#endif
                  getNumPic(), cDelim,
                  getBits() * dScale,
@@ -196,5 +213,5 @@
           //printf( "\t------------ "  " ----------"   " -------- "  " -------- "  " --------\n" );
 #if SVC_EXTENSION
-          printf( "    L%d\t %8d    %c "          "%12.4lf  "    "%8.4lf",
+          printf( "  L%d \t %8d    %c "          "%12.4lf  "    "%8.4lf",
                  layer,
 #else
@@ -223,4 +240,8 @@
           if (printMSEBasedSNR)
           {
+#if SVC_EXTENSION
+            if( layer == 0 )
+            {
+#endif
             printf( "         \tTotal Frames |   "   "Bitrate     "  "Y-PSNR    "  "U-PSNR    "  "V-PSNR    "  "YUV-PSNR " );
 
@@ -229,5 +250,11 @@
 
             //printf( "\t------------ "  " ----------"   " -------- "  " -------- "  " --------\n" );
+#if SVC_EXTENSION
+            }
+            printf( "Average:  L%d \t %8d    %c "          "%12.4lf  "    "%8.4lf  "   "%8.4lf  "    "%8.4lf  "   "%8.4lf",
+                   layer,
+#else
             printf( "Average: \t %8d    %c "          "%12.4lf  "    "%8.4lf  "   "%8.4lf  "    "%8.4lf  "   "%8.4lf",
+#endif
                    getNumPic(), cDelim,
                    getBits() * dScale,
@@ -247,5 +274,10 @@
             else printf("\n");
 
+#if SVC_EXTENSION
+            printf( "From MSE:  L%d \t %8d    %c "          "%12.4lf  "    "%8.4lf  "   "%8.4lf  "    "%8.4lf  "   "%8.4lf\n",
+                   layer,
+#else
             printf( "From MSE:\t %8d    %c "          "%12.4lf  "    "%8.4lf  "   "%8.4lf  "    "%8.4lf  "   "%8.4lf\n",
+#endif
                    getNumPic(), cDelim,
                    getBits() * dScale,
@@ -257,4 +289,8 @@
           else
           {
+#if SVC_EXTENSION
+            if( layer == 0 )
+            {
+#endif
             printf( "\tTotal Frames |   "   "Bitrate     "  "Y-PSNR    "  "U-PSNR    "  "V-PSNR    "  "YUV-PSNR " );
             
@@ -263,5 +299,11 @@
 
             //printf( "\t------------ "  " ----------"   " -------- "  " -------- "  " --------\n" );
+#if SVC_EXTENSION
+            }
+            printf( "  L%d \t %8d    %c "          "%12.4lf  "    "%8.4lf  "   "%8.4lf  "    "%8.4lf  "   "%8.4lf",
+                   layer,
+#else
             printf( "\t %8d    %c "          "%12.4lf  "    "%8.4lf  "   "%8.4lf  "    "%8.4lf  "   "%8.4lf",
+#endif
                    getNumPic(), cDelim,
                    getBits() * dScale,
