Merge "fix svace issue" into tizen

author Eunhae Choi <eunhae1.choi@samsung.com>

Tue, 21 Jun 2016 08:03:44 +0000 (01:03 -0700)

committer Gerrit Code Review <gerrit@review.vlan103.tizen.org>

Tue, 21 Jun 2016 08:03:44 +0000 (01:03 -0700)
author Eunhae Choi <eunhae1.choi@samsung.com>
Tue, 21 Jun 2016 08:03:44 +0000 (01:03 -0700)
committer Gerrit Code Review <gerrit@review.vlan103.tizen.org>
Tue, 21 Jun 2016 08:03:44 +0000 (01:03 -0700)
diff --cc src/media_streamer_gst.c
Simple merge
diff --cc src/media_streamer_node.c
Simple merge
author	Eunhae Choi <eunhae1.choi@samsung.com>
	Tue, 21 Jun 2016 08:03:44 +0000 (01:03 -0700)
committer	Gerrit Code Review <gerrit@review.vlan103.tizen.org>
	Tue, 21 Jun 2016 08:03:44 +0000 (01:03 -0700)
		1	2
src/media_streamer_gst.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/media_streamer_node.c	patch \|	diff1 \|	diff2 \|	blob \| history