commit f6b7dd7e7d6cd9c8ee18f6b8c9fba2f26a50bd35
author Jean-Michel Trivi <jmtrivi@google.com> Thu May 10 09:55:15 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu May 10 09:55:15 2012 -0700
tree 73759ba62a4c72cf3880c68828c7a3d1f481e9ee
parent 6bd1ae5e75a7ac67a72d15d6f0900284eaa4ea51
parent cb62e8bf2844266fd6fdcf8fd1ead7e1f2f08d92

Merge "Add FLAC encoder to the list of media codecs." into jb-dev

tools/emulator/system/camera/media_codecs.xml

diff --git a/tools/emulator/system/camera/media_codecs.xml b/tools/emulator/system/camera/media_codecs.xml
index 0bdea31..dcd8ce1 100644
--- a/tools/emulator/system/camera/media_codecs.xml
+++ b/tools/emulator/system/camera/media_codecs.xml
@@ -98,5 +98,6 @@
         <MediaCodec name="OMX.google.h263.encoder" type="video/3gpp" />
         <MediaCodec name="OMX.google.h264.encoder" type="video/avc" />
         <MediaCodec name="OMX.google.mpeg4.encoder" type="video/mp4v-es" />
+        <MediaCodec name="OMX.google.flac.encoder" type="audio/flac" />
     </Encoders>
 </MediaCodecs>