diff --git a/component-sources/omx/src/ti/omx/comp/vfpc/src/omx_vfpc.c b/component-sources/omx/src/ti/omx/comp/vfpc/src/omx_vfpc_mod.c
old mode 100644
new mode 100755
index 0f6c9b4..69c00fd
--- a/component-sources/omx/src/ti/omx/comp/vfpc/src/omx_vfpc.c
+++ b/component-sources/omx/src/ti/omx/comp/vfpc/src/omx_vfpc_mod.c
@@ -596,7 +596,7 @@ OMX_ERRORTYPE OMX_TI_VFPC_SetParameter ( OMX_HANDLETYPE hComponent,
     				                         nParamIndex,
     				                         pParamStruct);
     		}    		
-    	}
+    	} 
     	else
     	{
     	  eError = OMX_BASE_SetParameter(hComponent, 
@@ -604,7 +604,7 @@ OMX_ERRORTYPE OMX_TI_VFPC_SetParameter ( OMX_HANDLETYPE hComponent,
     			                         pParamStruct);
     	}
     	break;
-    }
+    }  
       
     /* Redirect to "OMX_BASE_SetParameter" to handle standrad indexes */
     default:
@@ -777,7 +777,7 @@ OMX_ERRORTYPE OMX_TI_VFPC_SetConfig ( OMX_HANDLETYPE hComponent,
           pVfpcComPvt->bFrameRateControlType = OMX_FALSE;
         }
         break;
-      }
+      } 
       
     case OMX_TI_IndexConfigSubSamplingFactor:
       {
@@ -786,7 +786,7 @@ OMX_ERRORTYPE OMX_TI_VFPC_SetConfig ( OMX_HANDLETYPE hComponent,
                  (OMX_CONFIG_SUBSAMPLING_FACTOR *) pConfigData;
         for(i = 0; i < OMX_VFPC_MAX_NUM_OUTPUT_FRAMES_PER_PROCESS; i++) {
           pVfpcComPvt->sDrvProperties.auOutputSubSampleFactor[i] =
-                                      pSubSamp->nSubSamplingFactor[i];
+                                      pSubSamp->nSubSamplingFactor;
         }
         break;
       }
@@ -2001,7 +2001,7 @@ static
       eError =
           pVfpcComPvt->fpDioGetCount ( hComponent,
                                        auPortIndex[i], &( auQueuedBufCnt[i] ) );
-      Log_print3(Diags_USER4,"%s port %d bufcount %d",(xdc_IArg)OMX_UTL_TRACE_MODULE_NAME,auPortIndex[i],auQueuedBufCnt[i]);
+     Log_print3(Diags_USER4,"%s port %d bufcount %d",(xdc_IArg)OMX_UTL_TRACE_MODULE_NAME,auPortIndex[i],auQueuedBufCnt[i]);
       if(pVfpcComPvt->bFrameRateControlType == OMX_TRUE)
       {
         if(OMX_DirInput == eDir)
@@ -2025,7 +2025,7 @@ static
                  auQueuedBufCnt[i]--;            
               }
         }
-      }
+      } 
       if (OMX_TI_WarningEosReceived != eError)
       {
         /*To suppress EOS warnings*/
@@ -2114,8 +2114,8 @@ static
       OMX_UTL_TRACE_FUNCTION_MSG_LEVEL2 ("VFPC:Get Buffer @ i/o port");
       nQueuedBufCnt = 0;
       eError =
-          pVfpcComPvt->fpDioGetCount ( hComponent,
-                                       auPortIndex[i], &nQueuedBufCnt );
+         pVfpcComPvt->fpDioGetCount ( hComponent,
+                                      auPortIndex[i], &nQueuedBufCnt );
       if(nQueuedBufCnt) {  
       Log_print2(Diags_USER4,"%s fpDioDequeue for port %d",(xdc_IArg)OMX_UTL_TRACE_MODULE_NAME,auPortIndex[i]);
       eError =
@@ -2820,8 +2820,6 @@ static
 
   OMX_ERRORTYPE eError = OMX_ErrorNone;
 
-  OMX_U32 nOutputPortsDisabled = 0;
-
   *pReadyChannelCount = 0;
   for ( i = 0; i < pVfpcComPvt->nMaxNumChannelsPerHandle; i++ ) {
     omxVfpcDrvChannelListCtx_t *pChannelCtx =
@@ -2841,7 +2839,6 @@ static
       }
     }
     if ( OMX_TRUE == bChannelReady ) {
-      nOutputPortsDisabled = 0;
       for ( j = 0; j < pDrvProp->nNumOutputPerProcess; j++ ) {
         OMX_U32 nPortIndex, nPortAryIndex;
 
@@ -2849,14 +2846,11 @@ static
         nPortAryIndex = nPortIndex - OMX_VFPC_OUTPUT_PORT_START_INDEX;
         if (( auOutBufCnt[nPortAryIndex] < 1 ) && 
             (OMX_FALSE == pChannelCtx->outSrc[j].bDiscardBuffer)) {
-          nOutputPortsDisabled++;
+          bChannelReady = OMX_FALSE; 
+          break;					 
         }
       /* for (j = 0; j < pDrvProp->nNumOutputPerProcess; j++) */
       }
-      if(nOutputPortsDisabled == pDrvProp->nNumOutputPerProcess)
-       {
-        bChannelReady = OMX_FALSE;
-       }
     /* end of if (OMX_TRUE == bChannelReady) */
     }
     if ( OMX_TRUE == bChannelReady ) {
@@ -2918,8 +2912,6 @@ static
 
   OMX_BOOL bChannelReturnBuffer = OMX_FALSE;
 
-  OMX_U32 nOutputPortsDisabled = 0;
-
   OMX_U32 nInPortIx, nCount;
 
   OMX_U32 nOutPortIx;
@@ -2971,17 +2963,12 @@ static
           bChannelActive = OMX_FALSE;
         }
       }
-      nOutputPortsDisabled = 0;
       for ( j = 0; j < pVfpcComPvt->sDrvProperties.nNumOutputPerProcess; j++ ) {  
         nOutPortIx = pVfpcComPvt->sOmxVfpcDrvChannelListCtx[i].outSrc[j].nPortIndex;
         if ( OMX_FALSE == pVfpcComPvt->pPortdefs[nOutPortIx]->bEnabled ) {
-          nOutputPortsDisabled++;
+		bChannelActive = OMX_FALSE; 
         } 
       }
-      if( nOutputPortsDisabled == pVfpcComPvt->sDrvProperties.nNumOutputPerProcess)
-       {
-         bChannelActive = OMX_FALSE;
-      }
       if ( OMX_TRUE == bChannelActive ) {   
         auChannelList[pVfpcComPvt->nChannelCount] = pVfpcComPvt->nChannelCount;
         pVfpcComPvt->nChannelCount++;
@@ -3116,17 +3103,14 @@ static
         for ( j = 0; j < pVfpcComPvt->sDrvProperties.nNumCurInputBufPerProcess; j++ ) {
           nInPortIx = pVfpcComPvt->sOmxVfpcDrvChannelListCtx[i].inSrc[j].nPortIndex;
           bChannelReturnBuffer = OMX_FALSE;
-          nOutputPortsDisabled = 0;
           for ( k = 0; k < pVfpcComPvt->sDrvProperties.nNumOutputPerProcess; k++ ) {
             nOutPortIx = pVfpcComPvt->sOmxVfpcDrvChannelListCtx[i].outSrc[k].nPortIndex;
             if  ( pVfpcComPvt->pPortdefs[nOutPortIx]->bEnabled == OMX_FALSE ){
-              nOutputPortsDisabled++;
-            }
+				
+				bChannelReturnBuffer = OMX_TRUE;
+				break;
             }
           /* Return input buffer only if all output ports are disabled */
-          if(nOutputPortsDisabled == pVfpcComPvt->sDrvProperties.nNumOutputPerProcess)
-           {
-            bChannelReturnBuffer = OMX_TRUE;
           }
           if  ( (bChannelReturnBuffer == OMX_TRUE) &&
                 (pVfpcComPvt->pPortdefs[nInPortIx]->bEnabled == OMX_TRUE) ){