projects / platform / core / multimedia / mmfw-sysconf.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: cb9f50f)
[all/camera] add supported attribute(M2TS) in ini. 74/57474/1 accepted/tizen/mobile/20160122.032528 accepted/tizen/tv/20160122.032531 accepted/tizen/wearable/20160122.032541 submit/tizen/20160120.101620
authorhaesu.gwon <haesu.gwon@samsung.com>
Wed, 20 Jan 2016 10:05:18 +0000 (19:05 +0900)
committerhaesu.gwon <haesu.gwon@samsung.com>
Wed, 20 Jan 2016 10:05:22 +0000 (19:05 +0900)
Change-Id: I89340659554d887e90cbafdd5843beab245acfcb
Signed-off-by: haesu.gwon <haesu.gwon@samsung.com>
mmfw-sysconf-simulator/usr/etc/mmfw_camcorder.ini.wayland patch | blob | history
mmfw-sysconf-simulator/usr/etc/mmfw_camcorder.ini.x patch | blob | history
mmfw-sysconf-target-tm1/usr/etc/mmfw_camcorder.ini.wayland patch | blob | history
mmfw-sysconf-target-tm1/usr/etc/mmfw_camcorder.ini.x patch | blob | history

diff --git a/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder.ini.wayland b/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder.ini.wayland
index bd2399829b01f040048b85879c7a220cd6aa9ef6..e6dbba844eb9d9944141bb4054305468cf2eaf3b 100644 (file)
--- a/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder.ini.wayland
+++ b/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder.ini.wayland
@@ -107,4 +107,5 @@ MP4 = avmux_mp4 | 0,0
 OGG = oggmux | 0,0
 WAV = wavenc | 0,0
 AAC = avmux_adts | 0,0
+M2TS = mpegtsmux | 0,0
 
diff --git a/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder.ini.x b/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder.ini.x
index bc69a64fd0f13f69befed3371f6a2e8e4f618d0e..52ab99c0642967dcad343e28d8155cd94eb9e055 100644 (file)
--- a/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder.ini.x
+++ b/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder.ini.x
@@ -107,4 +107,5 @@ MP4 = avmux_mp4 | 0,0
 OGG = oggmux | 0,0
 WAV = wavenc | 0,0
 AAC = avmux_adts | 0,0
+M2TS = mpegtsmux | 0,0
 
diff --git a/mmfw-sysconf-target-tm1/usr/etc/mmfw_camcorder.ini.wayland b/mmfw-sysconf-target-tm1/usr/etc/mmfw_camcorder.ini.wayland
index 6cc2e2bef7361156403f8c44a81e03292d412483..34353d7696ff1d685779d53026ab5164b588efb0 100644 (file)
--- a/mmfw-sysconf-target-tm1/usr/etc/mmfw_camcorder.ini.wayland
+++ b/mmfw-sysconf-target-tm1/usr/etc/mmfw_camcorder.ini.wayland
@@ -106,4 +106,5 @@ AVI = avimux | 0,0
 MATROSKA = matroskamux | 0,0
 WAV = wavenc | 0,0
 AAC = avmux_adts | 0,0
+M2TS = mpegtsmux | 0,0
 
diff --git a/mmfw-sysconf-target-tm1/usr/etc/mmfw_camcorder.ini.x b/mmfw-sysconf-target-tm1/usr/etc/mmfw_camcorder.ini.x
index 9ddfbdeca02ba3adf8ddff4d4ac6a9571129c915..8a487d846ac2a0f6055024c7e447a1b76b37ceaa 100644 (file)
--- a/mmfw-sysconf-target-tm1/usr/etc/mmfw_camcorder.ini.x
+++ b/mmfw-sysconf-target-tm1/usr/etc/mmfw_camcorder.ini.x
@@ -106,4 +106,5 @@ AVI = avimux | 0,0
 MATROSKA = matroskamux | 0,0
 WAV = wavenc | 0,0
 AAC = avmux_adts | 0,0
+M2TS = mpegtsmux | 0,0
 
Domain: Multimedia / Media Common;