summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Michel Trivi <jmtrivi@google.com>2012-05-10 09:55:02 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-05-10 09:55:03 -0700
commit3fee711cabbc64c2f5fb4a8d4d8737c4888f7f38 (patch)
treeb19587a8e2169cdac31ebd41924c1f8aa40b5dfe
parentb694faf0fe19bdeef5823c14c232572bb7d69869 (diff)
parent6366a3fa5e2084866cad4ac6ac69c884fe1d90da (diff)
downloaddevice_samsung_tuna-3fee711cabbc64c2f5fb4a8d4d8737c4888f7f38.zip
device_samsung_tuna-3fee711cabbc64c2f5fb4a8d4d8737c4888f7f38.tar.gz
device_samsung_tuna-3fee711cabbc64c2f5fb4a8d4d8737c4888f7f38.tar.bz2
Merge "Add FLAC encoder to the list of media codecs." into jb-dev
-rw-r--r--media_codecs.xml1
1 files changed, 1 insertions, 0 deletions
diff --git a/media_codecs.xml b/media_codecs.xml
index af21aa4..4ac9123 100644
--- a/media_codecs.xml
+++ b/media_codecs.xml
@@ -115,5 +115,6 @@ Only the three quirks included above are recognized at this point:
<MediaCodec name="OMX.google.amrnb.encoder" type="audio/3gpp" />
<MediaCodec name="OMX.google.amrwb.encoder" type="audio/amr-wb" />
<MediaCodec name="OMX.google.aac.encoder" type="audio/mp4a-latm" />
+ <MediaCodec name="OMX.google.flac.encoder" type="audio/flac" />
</Encoders>
</MediaCodecs>