Resolving conflicts

This commit is contained in:
Brenno
2020-10-20 01:04:59 -03:00
parent 1626e1eeba
commit a9274df96b
30 changed files with 314 additions and 351 deletions

View File

@@ -28,7 +28,7 @@
* along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
*/
#include "../include/CVStabilization.h"
#include "CVStabilization.h"
// Set default smoothing window value to compute stabilization
CVStabilization::CVStabilization(std::string processInfoJson, ProcessingController &processingController)