commit f7bedba08f3d2de1ab65c0898989cebe3776645b
author The Android Automerger <android-build@android.com> Wed Feb 01 07:02:00 2012 -0800
committer The Android Automerger <android-build@android.com> Wed Feb 01 07:02:00 2012 -0800
tree ddeddae1eb12ba064ef0a5479ba2615b37ebe22d
parent 01a3b7ff573332c1fc60f90769daed3ae9655bb0
parent b3289396800c9c7ff0d53285ca4dce0024e7f58b

merge in jb-release history after reset to master

libstagefrighthw/TIOMXPlugin.cpp

diff --git a/libstagefrighthw/TIOMXPlugin.cpp b/libstagefrighthw/TIOMXPlugin.cpp
index de764c6..cff5e90 100644
--- a/libstagefrighthw/TIOMXPlugin.cpp
+++ b/libstagefrighthw/TIOMXPlugin.cpp
@@ -43,7 +43,7 @@
       mGetRolesOfComponentHandle(NULL) {
     if (mLibHandle != NULL) {
         mInit = (InitFunc)dlsym(mLibHandle, "TIOMX_Init");
-        mDeinit = (DeinitFunc)dlsym(mLibHandle, "TIOMX_DeInit");
+        mDeinit = (DeinitFunc)dlsym(mLibHandle, "TIOMX_Deinit");
 
         mComponentNameEnum =
             (ComponentNameEnumFunc)dlsym(mLibHandle, "TIOMX_ComponentNameEnum");