Merge branch 'tizen_4.0' into 'tizen'

Change-Id: I4fae84ad8067f489f1d447265069e6c8a801c0d7

diff --cc packaging/capi-media-player.spec
index ca70726f05e79a5bfc67f34d39f95cbdfec7ea22,9423d7d24f3b3914d0a63b4c816f7e5faa93be8f..a264dcaf61162ff23a3e50c2e04313484ac7c194
--- 1/packaging/capi-media-player.spec
--- 2/packaging/capi-media-player.spec
+++ b/packaging/capi-media-player.spec
@@@ -45,12 -44,12 +45,12 @@@ Requires: %{name} = %{version}-%{releas
  %devel_desc
  
  %package display
--Summary:  A display interface library for Media Player libray
++Summary:  A display interface library for Media Player library
  Group:    Display/Multimedia
  Requires: %{name} = %{version}-%{release}
  
  %description display
--A display interface library for Media Player libray
++A display interface library for Media Player library
  
  %package utils
  Summary: A test app for Media Player API

diff --cc src/player.c
Simple merge

diff --cc test/player_test.c
index d8dd82eb7e1a4dae6465e9fbe51ddc9ab9f6cfde,531a17af0f53d2f995baab8801614361c7b53081..8421aa41892fc3073aee13375e488ac3db1fb039
--- 1/test/player_test.c
--- 2/test/player_test.c
+++ b/test/player_test.c
@@@ -2372,18 -2159,8 +2372,20 @@@ static void displaymenu(
                g_print("*** set audio only mode (0:disable, 1:enable) \n");
        } else if (g_menu_state == CURRENT_STATUS_SET_PRE_BUFFERING_SIZE) {
                g_print("*** set pre buffering size (ms) \n");
+       } else if (g_menu_state == CURRENT_STATUS_SET_RE_BUFFERING_SIZE) {
+               g_print("*** set re buffering size (ms) \n");
 +      } else if (g_menu_state == CURRENT_STATUS_VIDEO360_SET_ENABLE) {
 +              g_print("*** input video 360 status (0: disabled (full panorama), 1: enabled)\n");
 +      } else if (g_menu_state == CURRENT_STATUS_VIDEO360_SET_DOV) {
 +              g_print("*** input direction of view yaw angle (+/- 180 deg.)\n");
 +      } else if (g_menu_state == CURRENT_STATUS_VIDEO360_SET_DOV1) {
 +              g_print("*** input direction of view pitch angle (+/- 90 deg.)\n");
 +      } else if (g_menu_state == CURRENT_STATUS_VIDEO360_SET_FOV) {
 +              g_print("*** input horizontal field of view angle (1~360 deg.)\n");
 +      } else if (g_menu_state == CURRENT_STATUS_VIDEO360_SET_FOV1) {
 +              g_print("*** input vertical field of view angle (1~180 deg.)\n");
 +      } else if (g_menu_state == CURRENT_STATUS_VIDEO360_SET_ZOOM) {
 +              g_print("*** input zoom factor.(1.0~10.0, where 1.0 - no zoom, actual image) \n");
        } else {
                g_print("*** unknown status.\n");
                quit_program();