Index: includes/file.mimetypes.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/file.mimetypes.inc,v
retrieving revision 1.1
diff -u -9 -p -r1.1 file.mimetypes.inc
--- includes/file.mimetypes.inc	2 Jun 2009 13:42:40 -0000	1.1
+++ includes/file.mimetypes.inc	10 Jun 2009 19:28:44 -0000
@@ -188,18 +188,19 @@ function file_default_mimetype_mapping()
       179 => 'application/x-x509-ca-cert',
       180 => 'application/x-xcf',
       181 => 'application/x-xfig',
       182 => 'application/x-xpinstall',
       183 => 'application/xhtml+xml',
       184 => 'application/xml',
       185 => 'application/zip',
       186 => 'audio/basic',
       187 => 'audio/midi',
+      346 => 'audio/mp4',
       188 => 'audio/mpeg',
       189 => 'audio/ogg',
       190 => 'audio/prs.sid',
       191 => 'audio/x-aiff',
       192 => 'audio/x-gsm',
       193 => 'audio/x-mpegurl',
       194 => 'audio/x-ms-wax',
       195 => 'audio/x-ms-wma',
       196 => 'audio/x-pn-realaudio',
@@ -334,18 +335,19 @@ function file_default_mimetype_mapping()
       325 => 'video/dl',
       326 => 'video/dv',
       327 => 'video/fli',
       328 => 'video/gl',
       329 => 'video/mp4',
       330 => 'video/mpeg',
       331 => 'video/ogg',
       332 => 'video/quicktime',
       333 => 'video/vnd.mpegurl',
+      347 => 'video/x-flv',
       334 => 'video/x-la-asf',
       335 => 'video/x-mng',
       336 => 'video/x-ms-asf',
       337 => 'video/x-ms-wm',
       338 => 'video/x-ms-wmv',
       339 => 'video/x-ms-wmx',
       340 => 'video/x-ms-wvx',
       341 => 'video/x-msvideo',
       342 => 'video/x-sgi-movie',
@@ -784,18 +786,20 @@ function file_default_mimetype_mapping()
       'vcs' => 322,
       'vcf' => 323,
       '3gp' => 324,
       'dl' => 325,
       'dif' => 326,
       'dv' => 326,
       'fli' => 327,
       'gl' => 328,
       'mp4' => 329,
+      'f4v' => 329,
+      'f4p' => 329,
       'mpe' => 330,
       'mpeg' => 330,
       'mpg' => 330,
       'ogv' => 331,
       'qt' => 332,
       'mov' => 332,
       'mxu' => 333,
       'lsf' => 334,
       'lsx' => 334,
@@ -807,12 +811,15 @@ function file_default_mimetype_mapping()
       'wmx' => 339,
       'wvx' => 340,
       'avi' => 341,
       'movie' => 342,
       'ice' => 343,
       'sisx' => 344,
       'wrl' => 345,
       'vrm' => 345,
       'vrml' => 345,
+      'f4a' => 346,
+      'f4b' => 346,
+      'flv' => 347,
     ),
   );
 }