summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@android.com>2010-11-11 16:09:30 -0500
committerMike Lockwood <lockwood@android.com>2010-11-11 16:14:19 -0500
commit28d1a4aaf3c338f42d7b71d4653be707f06948a6 (patch)
tree4a99a3d197043c774e2d8d65c26fb3b2964bb7f4 /media
parentda38b6dce2bb87887ca13587c9060e575f345b33 (diff)
downloadframeworks_base-28d1a4aaf3c338f42d7b71d4653be707f06948a6.zip
frameworks_base-28d1a4aaf3c338f42d7b71d4653be707f06948a6.tar.gz
frameworks_base-28d1a4aaf3c338f42d7b71d4653be707f06948a6.tar.bz2
MediaFile: Recognize MPG file extension as MPEG video
Change-Id: Ief7308e5f562754a27f07e4fda970ffd7b1eb98e Signed-off-by: Mike Lockwood <lockwood@android.com>
Diffstat (limited to 'media')
-rw-r--r--media/java/android/media/MediaFile.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/media/java/android/media/MediaFile.java b/media/java/android/media/MediaFile.java
index 532a2df..80c97a0 100644
--- a/media/java/android/media/MediaFile.java
+++ b/media/java/android/media/MediaFile.java
@@ -170,6 +170,7 @@ public class MediaFile {
addFileType("OTA", FILE_TYPE_MID, "audio/midi");
addFileType("MPEG", FILE_TYPE_MP4, "video/mpeg", MtpConstants.FORMAT_MPEG);
+ addFileType("MPG", FILE_TYPE_MP4, "video/mpeg", MtpConstants.FORMAT_MPEG);
addFileType("MP4", FILE_TYPE_MP4, "video/mp4", MtpConstants.FORMAT_MPEG);
addFileType("M4V", FILE_TYPE_M4V, "video/mp4", MtpConstants.FORMAT_MPEG);
addFileType("3GP", FILE_TYPE_3GPP, "video/3gpp", MtpConstants.FORMAT_3GP_CONTAINER);