Merge branch 'tizen' into tizen_line_coverage

author Gilbok Lee <gilbok.lee@samsung.com>

Mon, 21 Oct 2019 05:42:23 +0000 (14:42 +0900)

committer Gilbok Lee <gilbok.lee@samsung.com>

Mon, 21 Oct 2019 05:42:23 +0000 (14:42 +0900)
author Gilbok Lee <gilbok.lee@samsung.com>
Mon, 21 Oct 2019 05:42:23 +0000 (14:42 +0900)
committer Gilbok Lee <gilbok.lee@samsung.com>
Mon, 21 Oct 2019 05:42:23 +0000 (14:42 +0900)
diff --cc include/video_util_private.h

index d504a0798a1ebc4641ddd5dacff658f64f940362,31b1c67f66fb3ff4ee9397ad28f931457e191b32..d504a0798a1ebc4641ddd5dacff658f64f940362

mode 100755,100644..100644
--- 1/include/video_util_private.h
--- 2/include/video_util_private.h
+++ b/include/video_util_private.h
diff --cc src/video_util.c

index 52b945f36edd03a467e4150ed1f7e458a4a6870b,fccfd68c55a5a46008e5c13b15385f1ff411d5a2..52b945f36edd03a467e4150ed1f7e458a4a6870b

mode 100755,100644..100644
--- 1/src/video_util.c
--- 2/src/video_util.c
+++ b/src/video_util.c
author	Gilbok Lee <gilbok.lee@samsung.com>
	Mon, 21 Oct 2019 05:42:23 +0000 (14:42 +0900)
committer	Gilbok Lee <gilbok.lee@samsung.com>
	Mon, 21 Oct 2019 05:42:23 +0000 (14:42 +0900)
		1	2
include/video_util_private.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/video_util.c	patch \|	diff1 \|	diff2 \|	blob \| history