Merge "1. Add warning log for getting sink pad result 2. Change tbm_bufmgr variable...

author Heechul Jeon <heechul.jeon@samsung.com>

Tue, 7 Jul 2015 04:27:41 +0000 (21:27 -0700)

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

Tue, 7 Jul 2015 04:27:41 +0000 (21:27 -0700)
author Heechul Jeon <heechul.jeon@samsung.com>
Tue, 7 Jul 2015 04:27:41 +0000 (21:27 -0700)
committer Gerrit Code Review <gerrit@review.vlan103.tizen.org>
Tue, 7 Jul 2015 04:27:41 +0000 (21:27 -0700)
diff --cc src/include/mm_player_priv.h

index 49171d4,0b9a876..0b9a876

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

index a09c19c,7dcabf5..7dcabf5

mode 100644,100755..100644
--- 1/src/mm_player_priv.c
--- 2/src/mm_player_priv.c
+++ b/src/mm_player_priv.c
author	Heechul Jeon <heechul.jeon@samsung.com>
	Tue, 7 Jul 2015 04:27:41 +0000 (21:27 -0700)
committer	Gerrit Code Review <gerrit@review.vlan103.tizen.org>
	Tue, 7 Jul 2015 04:27:41 +0000 (21:27 -0700)
		1	2
src/include/mm_player_priv.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/mm_player_priv.c	patch \|	diff1 \|	diff2 \|	blob \| history