commit 10e9f7c8e564b4bab036c56d1d59d9518c452305
author Andreas Huber <andih@google.com> Fri Aug 06 18:54:26 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Aug 06 18:54:26 2010 -0700
tree 04d90df171f3dd9a7399bc84eb8245f1b2da569d
parent 22d12e77f159751d50d3548f1aef18107c9c4089
parent 2500c2d6ff55c26452ccba925a9f8b86b926f43e

am 261aaa16: Merge "Properly skip the \'skip\' chunk in mpeg4 files." into gingerbread

Merge commit '261aaa16a2f469d7f3d3b56f1a45432460ee4dba' into gingerbread-plus-aosp

* commit '261aaa16a2f469d7f3d3b56f1a45432460ee4dba':
  Properly skip the 'skip' chunk in mpeg4 files.

media/libstagefright/MPEG4Extractor.cpp

diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp
index 7cea629..d937838 100644
--- a/media/libstagefright/MPEG4Extractor.cpp
+++ b/media/libstagefright/MPEG4Extractor.cpp
@@ -492,7 +492,6 @@
         case FOURCC('m', 'o', 'o', 'f'):
         case FOURCC('t', 'r', 'a', 'f'):
         case FOURCC('m', 'f', 'r', 'a'):
-        case FOURCC('s', 'k', 'i' ,'p'):
         case FOURCC('u', 'd', 't', 'a'):
         case FOURCC('i', 'l', 's', 't'):
         {