Merge "Access AVCDEC context after create fail check" into mnc-dr-dev am: eba5ad1a07 am: ba9840c1ce am: 6fd437edf7 am: b334ac03d9 am: a61eab4354 am: 193030ccf0 am: 407b19779b am: 7fc9b2250c am: af7531a478

am: 92fefbd90b

Change-Id: Iff64dd8e4afe9aabb3de3dc996ce5abec19ae678

media/libstagefright/codecs/avcdec/SoftAVCDec.cpp

@@ -274,10 +274,6 @@ status_t SoftAVC::initDecoder() {
 
         status = ivdec_api_function(mCodecCtx, (void *)&s_create_ip, (void *)&s_create_op);
 
-        mCodecCtx = (iv_obj_t*)s_create_op.s_ivd_create_op_t.pv_handle;
-        mCodecCtx->pv_fxns = dec_fxns;
-        mCodecCtx->u4_size = sizeof(iv_obj_t);
-
         if (status != IV_SUCCESS) {
             ALOGE("Error in create: 0x%x",
                     s_create_op.s_ivd_create_op_t.u4_error_code);
@@ -285,6 +281,10 @@ status_t SoftAVC::initDecoder() {
             mCodecCtx = NULL;
             return UNKNOWN_ERROR;
         }
+
+        mCodecCtx = (iv_obj_t*)s_create_op.s_ivd_create_op_t.pv_handle;
+        mCodecCtx->pv_fxns = dec_fxns;
+        mCodecCtx->u4_size = sizeof(iv_obj_t);
     }
 
     /* Reset the plugin state */