Merge "changed player_set_sound_type to player_set_sound_stream_info. MM api has...

author Heeyong Song <heeyong.song@samsung.com>

Mon, 5 Mar 2018 08:33:09 +0000 (08:33 +0000)

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

Mon, 5 Mar 2018 08:33:09 +0000 (08:33 +0000)
author Heeyong Song <heeyong.song@samsung.com>
Mon, 5 Mar 2018 08:33:09 +0000 (08:33 +0000)
committer Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Mon, 5 Mar 2018 08:33:09 +0000 (08:33 +0000)
diff --cc dali-extension/video-player/tizen-video-player.cpp
Simple merge
diff --cc dali-extension/video-player/tizen-video-player.h
Simple merge
author	Heeyong Song <heeyong.song@samsung.com>
	Mon, 5 Mar 2018 08:33:09 +0000 (08:33 +0000)
committer	Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
	Mon, 5 Mar 2018 08:33:09 +0000 (08:33 +0000)
		1	2
dali-extension/video-player/tizen-video-player.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
dali-extension/video-player/tizen-video-player.h	patch \|	diff1 \|	diff2 \|	blob \| history