Merge remote-tracking branch 'aokp/kitkat' into sm-4.4

AOKPK · May 14, 2014 · 63044f6 · 63044f6
2 parents b82494d + 432083a
commit 63044f6
Showing 1 changed file with 23 additions and 0 deletions.
diff --git a/media_codecs.xml b/media_codecs.xml
@@ -66,5 +66,28 @@
         <MediaCodec name="OMX.google.h264.decoder" type="video/avc" />
         <MediaCodec name="OMX.google.h263.decoder" type="video/3gpp" />
         <MediaCodec name="OMX.google.mpeg4.decoder" type="video/mp4v-es" />
+
+        <!--  ffmpeg audio codecs  -->
+        <MediaCodec name="OMX.ffmpeg.ra.decoder" type="audio/vnd.rn-realaudio"/>
+        <MediaCodec name="OMX.ffmpeg.flac.decoder" type="audio/flac"/>
+        <MediaCodec name="OMX.ffmpeg.mp2.decoder" type="audio/mpeg-L2"/>
+        <MediaCodec name="OMX.ffmpeg.ac3.decoder" type="audio/ac3"/>
+        <MediaCodec name="OMX.ffmpeg.ape.decoder" type="audio/x-ape"/>
+        <MediaCodec name="OMX.ffmpeg.dts.decoder" type="audio/vnd.dts"/>
+        <MediaCodec name="OMX.ffmpeg.atrial.decoder" type="audio/ffmpeg"/>
+
+        <!--  ffmpeg video codecs  -->
+        <MediaCodec name="OMX.ffmpeg.mpeg2v.decoder" type="video/mpeg2"/>
+        <MediaCodec name="OMX.ffmpeg.h263.decoder" type="video/3gpp"/>
+        <MediaCodec name="OMX.ffmpeg.mpeg4.decoder" type="video/mp4v-es"/>
+        <MediaCodec name="OMX.ffmpeg.wmv.decoder" type="video/x-ms-wmv"/>
+        <MediaCodec name="OMX.ffmpeg.rv.decoder" type="video/vnd.rn-realvideo"/>
+        <MediaCodec name="OMX.ffmpeg.h264.decoder" type="video/avc"/>
+        <MediaCodec name="OMX.ffmpeg.vc1.decoder" type="video/vc1"/>
+        <MediaCodec name="OMX.ffmpeg.flv1.decoder" type="video/x-flv"/>
+        <MediaCodec name="OMX.ffmpeg.divx.decoder" type="video/divx"/>
+        <MediaCodec name="OMX.ffmpeg.hevc.decoder" type="video/hevc"/>
+        <MediaCodec name="OMX.ffmpeg.vtrial.decoder" type="video/ffmpeg"/>
+
     </Decoders>
 </MediaCodecs>