Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4e57aa3f authored by Steve Kondik's avatar Steve Kondik Committed by Gerrit Code Review
Browse files

Merge "Revert "frameworks/base: media: add support for DIVX files"" into cm-10.2

parents 097c9209 c5c3a9c2

media/java/android/media/MediaFile.java

+1 −3
Original line number Diff line number Diff line
@@ -86,9 +86,8 @@ public class MediaFile { 


    // More video file types

    public static final int FILE_TYPE_MP2PS   = 200;

    public static final int FILE_TYPE_DIVX    = 201;

    private static final int FIRST_VIDEO_FILE_TYPE2 = FILE_TYPE_MP2PS;

    private static final int LAST_VIDEO_FILE_TYPE2 = FILE_TYPE_DIVX;

    private static final int LAST_VIDEO_FILE_TYPE2 = FILE_TYPE_MP2PS;



    // Image file types

    public static final int FILE_TYPE_JPEG    = 32;
@@ -264,7 +263,6 @@ public class MediaFile { 
        addFileType("ZIP", FILE_TYPE_ZIP, "application/zip");

        addFileType("MPG", FILE_TYPE_MP2PS, "video/mp2p");

        addFileType("MPEG", FILE_TYPE_MP2PS, "video/mp2p");

        addFileType("DIVX", FILE_TYPE_DIVX, "video/divx");

    }



    public static boolean isAudioFileType(int fileType) {