Update video encoder configuration

diff --git a/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder.ini b/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder.ini
index 3cb1875..8fa0a8c 100644 (file)
--- a/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder.ini
+++ b/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder.ini
@@ -61,13 +61,14 @@ VideoscaleElement = videoscale | 1,0 | method,1
 
 [VideoEncoder]
 H263 = emulenc_h263 | 0,0
-MPEG4 = emulenc_mpeg4 | 0,0
+MPEG4 = ffenc_mpeg4 | 0,0
 THEORA = theoraenc | 1,0 | num-bufs,4
 
 [AudioEncoder]
 AMR = amrnbenc | 0,0
 WAVE = wavenc | 0,0
 VORBIS = vorbisenc | 0,0
+AAC = ffenc_aac | 0,0
 
 [ImageEncoder]
 JPEG = jpegenc | 0,0
@@ -104,7 +105,7 @@ PassFirstVideoFrame = 0
 ;AMR = ffmux_amr_ext | 0,0
 AMR = ffmux_amr | 0,0
 ;MP4 = ffmux_mp4_ext | 0,0
-MP4 = ffmux_mp4 | 0,0
+MP4 = mp4mux | 0,0
 OGG = oggmux | 0,0
 WAV = wavenc | 0,0
 

diff --git a/packaging/mmfw-sysconf-mfld-blackbay.changes b/packaging/mmfw-sysconf-mfld-blackbay.changes
index da529c2..8778aa3 100644 (file)
--- a/packaging/mmfw-sysconf-mfld-blackbay.changes
+++ b/packaging/mmfw-sysconf-mfld-blackbay.changes
@@ -1,3 +1,6 @@
+* Mon Sep 10 2012 Marko Ollonen <marko.ollonen@ixonos.com> submit/2.0_beta/20120907.075707@306f738
+- Update video encoder configuration
+
 * Fri Sep 07 2012 Yan Yin <yan.yin@intel.com> submit/2.0_beta/20120907.011104@acdddfc
 - use vaapisink to enable hardware video acceleration.