commit f690341bbb757c578019cd95461881ccb680f794
author The Android Automerger <android-build@android.com> Mon Jan 28 22:17:50 2013 -0800
committer The Android Automerger <android-build@android.com> Mon Jan 28 22:17:50 2013 -0800
tree b74eb636c52dde04696328a918b2f7d9036b438e
parent efbf2fc85af3ab846b0c6621fcdb12288361a58b
parent b1baa0b3d1d7b4c1b205bfe14ea327126995734a

merge in jb-mr1.1-release history after reset to jb-mr1.1-dev

media_codecs.xml

diff --git a/media_codecs.xml b/media_codecs.xml
index 9e460e9..82dc5a7 100644
--- a/media_codecs.xml
+++ b/media_codecs.xml
@@ -49,11 +49,6 @@
             <Quirk name="requires-allocate-on-output-ports"/>
             <Quirk name="defers-output-buffer-allocation"/>
         </MediaCodec>
-        <MediaCodec name="OMX.qcom.video.decoder.mpeg2" type="video/mpeg2" >
-            <Quirk name="requires-allocate-on-input-ports" />
-            <Quirk name="requires-allocate-on-output-ports"/>
-            <Quirk name="defers-output-buffer-allocation"/>
-        </MediaCodec>
         <MediaCodec name="OMX.qcom.video.decoder.mpeg4" type="video/mp4v-es" >
             <Quirk name="requires-allocate-on-input-ports" />
             <Quirk name="requires-allocate-on-output-ports"/>