diff --git a/exynos3/s5pc110/sec_mm/sec_omx/sec_codecs/Android.mk b/exynos3/s5pc110/sec_mm/sec_omx/sec_codecs/Android.mk
index 3c163a4e..05d4d86e 100644
--- a/exynos3/s5pc110/sec_mm/sec_omx/sec_codecs/Android.mk
+++ b/exynos3/s5pc110/sec_mm/sec_omx/sec_codecs/Android.mk
@@ -2,6 +2,10 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 
-include   $(SEC_CODECS)/video/mfc_c110/dec/Android.mk
-include   $(SEC_CODECS)/video/mfc_c110/enc/Android.mk
-include   $(SEC_CODECS)/video/mfc_c110/csc/Android.mk
\ No newline at end of file
+include $(SEC_CODECS)/video/mfc_c110/dec/Android.mk
+include $(SEC_CODECS)/video/mfc_c110/enc/Android.mk
+include $(SEC_CODECS)/video/mfc_c110/csc/Android.mk
+
+ifneq ($(TARGET_SEC_OMX_BIG_MMAP_BUFFER_SIZE),true)
+    LOCAL_CFLAGS += -DBIG_MMAP_BUFFER_SIZE
+endif
diff --git a/exynos3/s5pc110/sec_mm/sec_omx/sec_codecs/video/mfc_c110/include/SsbSipMfcApi.h b/exynos3/s5pc110/sec_mm/sec_omx/sec_codecs/video/mfc_c110/include/SsbSipMfcApi.h
index 118e1bab..071fb5d0 100644
--- a/exynos3/s5pc110/sec_mm/sec_omx/sec_codecs/video/mfc_c110/include/SsbSipMfcApi.h
+++ b/exynos3/s5pc110/sec_mm/sec_omx/sec_codecs/video/mfc_c110/include/SsbSipMfcApi.h
@@ -23,7 +23,11 @@
 #define MAX_DECODER_INPUT_BUFFER_SIZE  (1024 * 3072)
 #define MAX_ENCODER_OUTPUT_BUFFER_SIZE (1024 * 3072)
 
+#ifdef BIG_MMAP_BUFFER_SIZE
+#define MMAP_BUFFER_SIZE_MMAP          (62*1024*1024)
+#else
 #define MMAP_BUFFER_SIZE_MMAP          (35328*1024) // 34.5*1024*1024
+#endif // BIG_MMAP_BUFFER_SIZE
 
 #define S5PC110_MFC_DEV_NAME           "/dev/s3c-mfc"
 
diff --git a/exynos3/s5pc110/sec_mm/sec_omx/sec_omx_component/video/dec/Android.mk b/exynos3/s5pc110/sec_mm/sec_omx/sec_omx_component/video/dec/Android.mk
index 772c4775..5802cc06 100644
--- a/exynos3/s5pc110/sec_mm/sec_omx/sec_omx_component/video/dec/Android.mk
+++ b/exynos3/s5pc110/sec_mm/sec_omx/sec_omx_component/video/dec/Android.mk
@@ -17,4 +17,8 @@ LOCAL_C_INCLUDES := $(SEC_OMX_INC)/khronos \
 
 LOCAL_C_INCLUDES += $(SEC_OMX_TOP)/sec_codecs/video/mfc_c110/include
 
+ifeq ($(TARGET_USE_HWDECODING_TVOUT),true)
+    LOCAL_CFLAGS += -DUSE_HWDECODING_TVOUT
+endif
+
 include $(BUILD_STATIC_LIBRARY)
diff --git a/exynos3/s5pc110/sec_mm/sec_omx/sec_omx_component/video/dec/h264dec/SEC_OMX_H264dec.c b/exynos3/s5pc110/sec_mm/sec_omx/sec_omx_component/video/dec/h264dec/SEC_OMX_H264dec.c
index 64ac7ebe..63769898 100644
--- a/exynos3/s5pc110/sec_mm/sec_omx/sec_omx_component/video/dec/h264dec/SEC_OMX_H264dec.c
+++ b/exynos3/s5pc110/sec_mm/sec_omx/sec_omx_component/video/dec/h264dec/SEC_OMX_H264dec.c
@@ -699,13 +699,15 @@ OMX_ERRORTYPE SEC_MFC_H264Dec_GetExtensionIndex(
         ret = OMX_ErrorNone;
 #ifdef USE_ANDROID_EXTENSION
     } else if (SEC_OSAL_Strcmp(cParameterName, SEC_INDEX_PARAM_ENABLE_ANB) == 0) {
-	    if (isTvOutEnabled()) {
-	        // Samsung normally pushes HW-decoded frames to the TV Out driver
-	        // but it's hard for us to do that without source, so return an error
-	        // and let Android fallback to software decoding
-	        ret = OMX_ErrorInsufficientResources;
-	        goto EXIT;
-	    }
+#ifndef USE_HWDECODING_TVOUT
+            if (isTvOutEnabled()) {
+                // Samsung normally pushes HW-decoded frames to the TV Out driver
+                // but it's hard for us to do that without source, so return an error
+                // and let Android fallback to software decoding
+                ret = OMX_ErrorInsufficientResources;
+                goto EXIT;
+            }
+#endif // USE_HWDECODING_TVOUT
 
         *pIndexType = OMX_IndexParamEnableAndroidBuffers;
         ret = OMX_ErrorNone;
diff --git a/exynos3/s5pc110/sec_mm/sec_omx/sec_omx_component/video/dec/mpeg4dec/SEC_OMX_Mpeg4dec.c b/exynos3/s5pc110/sec_mm/sec_omx/sec_omx_component/video/dec/mpeg4dec/SEC_OMX_Mpeg4dec.c
index fb679da5..1da14e7b 100644
--- a/exynos3/s5pc110/sec_mm/sec_omx/sec_omx_component/video/dec/mpeg4dec/SEC_OMX_Mpeg4dec.c
+++ b/exynos3/s5pc110/sec_mm/sec_omx/sec_omx_component/video/dec/mpeg4dec/SEC_OMX_Mpeg4dec.c
@@ -836,13 +836,15 @@ OMX_ERRORTYPE SEC_MFC_Mpeg4Dec_GetExtensionIndex(
         ret = OMX_ErrorNone;
 #ifdef USE_ANDROID_EXTENSION
     } else if (SEC_OSAL_Strcmp(cParameterName, SEC_INDEX_PARAM_ENABLE_ANB) == 0) {
-	    if (isTvOutEnabled()) {
-	        // Samsung normally pushes HW-decoded frames to the TV Out driver
-	        // but it's hard for us to do that without source, so return an error
-	        // and let Android fallback to software decoding
-	        ret = OMX_ErrorInsufficientResources;
-	        goto EXIT;
-	    }
+#ifndef USE_HWDECODING_TVOUT
+            if (isTvOutEnabled()) {
+                // Samsung normally pushes HW-decoded frames to the TV Out driver
+                // but it's hard for us to do that without source, so return an error
+                // and let Android fallback to software decoding
+                ret = OMX_ErrorInsufficientResources;
+                goto EXIT;
+            }
+#endif // USE_HWDECODING_TVOUT
 
         *pIndexType = OMX_IndexParamEnableAndroidBuffers;
         ret = OMX_ErrorNone;