From: Gilbok Lee Date: Mon, 21 Oct 2019 05:38:13 +0000 (+0900) Subject: Merge branch 'tizen' into tizen_line_coverage X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fheads%2Ftizen_line_coverage;p=platform%2Fcore%2Fapi%2Fmediademuxer.git Merge branch 'tizen' into tizen_line_coverage Change-Id: I732a4692f86b012ec68fb2d28af517843f0ca4fa --- 2d4a591d2fab3cd8e3a64c8ff689a996d71a0516 diff --cc include/mediademuxer_util.h index 7d938db,93c7a58..7d938db mode 100755,100644..100644 --- a/include/mediademuxer_util.h +++ b/include/mediademuxer_util.h diff --cc src/mediademuxer_port.c index 686e222,0d5dd63..686e222 mode 100755,100644..100644 --- a/src/mediademuxer_port.c +++ b/src/mediademuxer_port.c diff --cc src/port_gst/mediademuxer_port_gst.c index 114b1c6,7812329..03c8c4e mode 100755,100644..100644 --- a/src/port_gst/mediademuxer_port_gst.c +++ b/src/port_gst/mediademuxer_port_gst.c