Merge branch 'tizen_4.0' into 'tizen'

Change-Id: I5fc38ad509f9964cc16b6996390e7f11cd910dc1

diff --cc packaging/libmm-player.spec
Simple merge

diff --cc src/include/mm_player_priv.h
index 6207846,0cec7d9..81899d0
--- 1/src/include/mm_player_priv.h
--- 2/src/include/mm_player_priv.h
+++ b/src/include/mm_player_priv.h
@@@ -74,12 -74,12 +74,14 @@@
   */
  #define MM_PLAYER_GET_ATTRS(x_player) (MM_PLAYER_CAST(x_player)->attrs)
  
- #define ROTATION_USING_SINK   0
- #define ROTATION_USING_CUSTOM 1
- #define ROTATION_USING_FLIP   2
+ #define ROTATION_USING_SINK     0
+ #define ROTATION_USING_CUSTOM   1
+ #define ROTATION_USING_FLIP     2
+ 
+ #define MM_MAX_STRING_LENGTH    4000 /* have to be less than MUSE_MSG_MAX_LENGTH */
  
 +#define VIDEO360_MAX_ZOOM     10.0f
 +
  /*---------------------------------------------------------------------------
  |    GLOBAL CONSTANT DEFINITIONS:                                                                                     |
  ---------------------------------------------------------------------------*/

diff --cc src/mm_player.c
Simple merge

diff --cc src/mm_player_attrs.c
Simple merge

diff --cc src/mm_player_priv.c
Simple merge