Merge branch 'roman_devel' into tizen

Change-Id: Idded1522597950792327605cf2683b3afb236e0c
Signed-off-by: Junkyeong Kim <jk0430.kim@samsung.com>

diff --cc src/eom.c
index 7204c3e,2d5cf72..43ae03a
mode 100644,100755..100644
--- 1/src/eom.c
--- 2/src/eom.c
+++ b/src/eom.c
@@@ -180,27 -182,11 +181,27 @@@ _eom_mutex_init(void
                return true;
  
        if (pthread_mutex_init(&eom_lock, NULL)) {
-               fprintf(stderr, "fail: eom mutex init");
-               return false;
+               fprintf(stderr, "fail: eom mutex init");/*LCOV_EXCL_LINE*/
+               return false;/*LCOV_EXCL_LINE*/
        }
  
 -      init = true;
 +      eom_mutex_init = true;
 +
 +      return true;
 +}
 +
 +static bool
 +_eom_mutex_destory(void)
 +{
 +      if (!eom_mutex_init)
 +              return true;
 +
 +      if (pthread_mutex_destroy(&eom_lock)) {
 +              fprintf(stderr, "fail: eom mutex destory");
 +              return false;
 +      }
 +
 +      eom_mutex_init = false;
  
        return true;
  }
@@@ -577,8 -566,8 +588,9 @@@ eom_deinit(void
                output_info_list = g_list_remove(output_info_list, output_info);
  
                _eom_free_output_info(&output_info);
+ /*LCOV_EXCL_STOP*/
        }
 +      output_info_list = NULL;
  
        _eom_mutex_unlock();
  

diff --cc src/wayland/eom-wayland.c
Simple merge