Merge "Fixed a bug what video plugin doesn't show the video if only video file is...

author taeyoon0.lee <taeyoon0.lee@samsung.com>

Tue, 6 Feb 2018 07:26:47 +0000 (07:26 +0000)

committer Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>

Tue, 6 Feb 2018 07:26:47 +0000 (07:26 +0000)
author taeyoon0.lee <taeyoon0.lee@samsung.com>
Tue, 6 Feb 2018 07:26:47 +0000 (07:26 +0000)
committer Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Tue, 6 Feb 2018 07:26:47 +0000 (07:26 +0000)
diff --cc dali-extension/video-player/tizen-video-player.cpp
Simple merge
author	taeyoon0.lee <taeyoon0.lee@samsung.com>
	Tue, 6 Feb 2018 07:26:47 +0000 (07:26 +0000)
committer	Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
	Tue, 6 Feb 2018 07:26:47 +0000 (07:26 +0000)