commit 41406a64e9777fe95f36e5774e08466d54ff3501
author Keun-young Park <keunyoung@google.com> Tue Sep 04 10:29:24 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Sep 04 10:29:24 2012 -0700
tree 12e3b7b15f6342deb2c0e7a69a6f3cff303cec63
parent 983740d3f3f12df0cc88907ae2cb35fcc125c267
parent d866ed04ecb7b051b89abe7b479ab73a5c15f094

am d866ed04: Merge "Remove optional video encoder: MPEG-4 SP" into jb-dev

* commit 'd866ed04ecb7b051b89abe7b479ab73a5c15f094':
  Remove optional video encoder: MPEG-4 SP

tests/tests/media/src/android/media/cts/MediaCodecListTest.java

diff --git a/tests/tests/media/src/android/media/cts/MediaCodecListTest.java b/tests/tests/media/src/android/media/cts/MediaCodecListTest.java
old mode 100644
new mode 100755
index d89d992..e6abe31
--- a/tests/tests/media/src/android/media/cts/MediaCodecListTest.java
+++ b/tests/tests/media/src/android/media/cts/MediaCodecListTest.java
@@ -182,7 +182,6 @@
         list.add(new CodecType("video/3gpp", false));           // h263 decoder
         list.add(new CodecType("video/3gpp", true));            // h263 encoder
         list.add(new CodecType("video/mp4v-es", false));        // m4v decoder
-        list.add(new CodecType("video/mp4v-es", true));         // m4v encoder
         list.add(new CodecType("video/x-vnd.on2.vp8", false));  // vp8 decoder
 
         return list;