diff --git a/mpp/mpp.cpp b/mpp/mpp.cpp
index 6bd1312d..a354b721 100644
--- a/mpp/mpp.cpp
+++ b/mpp/mpp.cpp
@@ -46,12 +46,13 @@ Mpp::Mpp(MppCtxType type, MppCodingType coding)
       mInternalGroup(NULL),
       mPacketGroup(NULL),
       mFrameGroup(NULL),
-      mDec(NULL),
       mTheadCodec(NULL),
       mThreadHal(NULL),
       mType(type),
       mCoding(coding),
       mStatus(0),
+      mDec(NULL),
+      mEnc(NULL),
       mTask(NULL),
       mTaskNum(2)
 {
diff --git a/mpp/mpp.h b/mpp/mpp.h
index ba0d05d0..831693d5 100644
--- a/mpp/mpp.h
+++ b/mpp/mpp.h
@@ -74,8 +74,8 @@ public:
 
     RK_U32          mStatus;
 
-    MppDec       *mDec;
-    MppDec       *mEnc;
+    MppDec          *mDec;
+    MppDec          *mEnc;
 
     MppHalDecTask   **mTask;
     RK_U32          mTaskNum;
diff --git a/osal/mpp_log.cpp b/osal/mpp_log.cpp
index 1221c1da..c9f15043 100644
--- a/osal/mpp_log.cpp
+++ b/osal/mpp_log.cpp
@@ -77,29 +77,29 @@ void __mpp_log(mpp_log_callback func, const char *tag, const char *fmt, const ch
     func(tag, buf, args);
 }
 
-void _mpp_log(const char *tag, const char *fmt, const char *func, ...)
+void _mpp_log(const char *tag, const char *fmt, const char *fname, ...)
 {
     va_list args;
-    va_start(args, fmt);
-    __mpp_log(os_log, tag, fmt, func, args);
+    va_start(args, fname);
+    __mpp_log(os_log, tag, fmt, fname, args);
     va_end(args);
 }
 
-void __mpp_dbg(RK_U32 debug, RK_U32 flag, const char *tag, const char *fmt, const char *func, ...)
+void __mpp_dbg(RK_U32 debug, RK_U32 flag, const char *tag, const char *fmt, const char *fname, ...)
 {
     if (debug & flag) {
         va_list args;
-        va_start(args, fmt);
-        __mpp_log(os_log, tag, fmt, func, args);
+        va_start(args, fname);
+        __mpp_log(os_log, tag, fmt, fname, args);
         va_end(args);
     }
 }
 
-void _mpp_err(const char *tag, const char *fmt, const char *func, ...)
+void _mpp_err(const char *tag, const char *fmt, const char *fname, ...)
 {
     va_list args;
-    va_start(args, fmt);
-    __mpp_log(os_err, tag, fmt, func, args);
+    va_start(args, fname);
+    __mpp_log(os_err, tag, fmt, fname, args);
     va_end(args);
 }