| commit | d6a9771c65d06031c88f7514d1b71d4aaf35d78d | [log] [tgz] |
|---|---|---|
| author | The Android Automerger <android-build@google.com> | Thu May 16 05:55:38 2013 -0700 |
| committer | The Android Automerger <android-build@google.com> | Thu May 16 05:55:38 2013 -0700 |
| tree | 0bfc41a6bb35b61da273a5f8fc74d4f2e183f746 | |
| parent | 25bee067b500484f8b0a1976da0ff672a7eb7e9e [diff] | |
| parent | 6a55c15fd683b6ccf55ad3cca4131e531554c164 [diff] |
merge in jb-mr2-release history after reset to jb-mr2-dev
diff --git a/exynos_omx/openmax/exynos_omx/component/common/Exynos_OMX_Resourcemanager.c b/exynos_omx/openmax/exynos_omx/component/common/Exynos_OMX_Resourcemanager.c index e8be83b..6645fb2 100644 --- a/exynos_omx/openmax/exynos_omx/component/common/Exynos_OMX_Resourcemanager.c +++ b/exynos_omx/openmax/exynos_omx/component/common/Exynos_OMX_Resourcemanager.c
@@ -40,7 +40,7 @@ #define MAX_RESOURCE_VIDEO_DEC 3 /* for Android */ -#define MAX_RESOURCE_VIDEO_ENC 1 /* for Android */ +#define MAX_RESOURCE_VIDEO_ENC 2 /* for Android */ /* Max allowable video scheduler component instance */ static EXYNOS_OMX_RM_COMPONENT_LIST *gpVideoDecRMComponentList = NULL;