Merge branch 'tizen' into tizen_line_coverage

Change-Id: I732a4692f86b012ec68fb2d28af517843f0ca4fa

diff --cc include/mediademuxer_util.h
index 7d938dbfb9737ab477bff9e7190c0157683e7195,93c7a580604bbd7ca769c99868143fe5ea2676e1..7d938dbfb9737ab477bff9e7190c0157683e7195
mode 100755,100644..100644
--- 1/include/mediademuxer_util.h
--- 2/include/mediademuxer_util.h
+++ b/include/mediademuxer_util.h

diff --cc src/mediademuxer_port.c
index 686e2221bec52879e7257423eb6ff3d9dab59e4a,0d5dd63c867701ce5bf160428dcb2ab4cc54c707..686e2221bec52879e7257423eb6ff3d9dab59e4a
mode 100755,100644..100644
--- 1/src/mediademuxer_port.c
--- 2/src/mediademuxer_port.c
+++ b/src/mediademuxer_port.c

diff --cc src/port_gst/mediademuxer_port_gst.c
index 114b1c6de03df31eb4179fde63fa781a5a6969e8,781232900499ec7d470308312899f6e3b0531fbe..03c8c4e40fe1765e695ce8e5c384285f63fa90bd
mode 100755,100644..100644
--- 1/src/port_gst/mediademuxer_port_gst.c
--- 2/src/port_gst/mediademuxer_port_gst.c
+++ b/src/port_gst/mediademuxer_port_gst.c