Index: jquery_media.jq.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/jquery_media/jquery_media.jq.inc,v
retrieving revision 1.4.2.1
diff -u -p -r1.4.2.1 jquery_media.jq.inc
--- jquery_media.jq.inc	30 Jun 2008 14:26:55 -0000	1.4.2.1
+++ jquery_media.jq.inc	23 Jan 2009 22:56:23 -0000
@@ -84,6 +84,12 @@ function _jquery_media_add($options = ar
       $defaults['flvplayer'] = $options['flvplayer'] ? url($options['flvplayer']) : url(variable_get('jquery_media_flvplayer', JQUERY_MEDIA_FLVPLAYER_DEFAULT));
       $js .= "    $.fn.media.defaults.flvPlayer = '{$defaults['flvplayer']}';\n";
     }
+    if (!($default_js_loaded || isset($defaults['mp4 flash'])) || $options['mp4 flash']) {
+      $defaults['mp4 flash'] = $options['mp4 flash'] ? $options['mp4 flash'] : variable_get('jquery_media_mp4_flash', JQUERY_MEDIA_MP4_FLASH_DEFAULT);
+      if ($defaults['mp4 flash']) {
+        $js .= "    $.fn.media.mp4 = $.fn.media.flv;\n";
+      }
+    }
     if (!($default_js_loaded || isset($defaults['mp3player'])) || $options['mp3player']) {
       $defaults['mp3player'] = $options['mp3player'] ? url($options['mp3player']) : url(variable_get('jquery_media_mp3player', JQUERY_MEDIA_MP3PLAYER_DEFAULT));
       $js .= "    $.fn.media.defaults.mp3Player = '{$defaults['mp3player']}';\n";
Index: jquery_media.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/jquery_media/jquery_media.module,v
retrieving revision 1.5.2.6
diff -u -p -r1.5.2.6 jquery_media.module
--- jquery_media.module	17 Dec 2008 14:43:50 -0000	1.5.2.6
+++ jquery_media.module	23 Jan 2009 22:56:24 -0000
@@ -13,6 +13,7 @@ define('JQUERY_MEDIA_BGCOLOR_DEFAULT', '
 define('JQUERY_MEDIA_AUTOPLAY_DEFAULT', 0);
 define('JQUERY_MEDIA_FLVPLAYER_DEFAULT', 'mediaplayer.swf');
 define('JQUERY_MEDIA_MP3PLAYER_DEFAULT', 'mediaplayer.swf');
+define('JQUERY_MEDIA_MP4_FLASH_DEFAULT', 0);
 define('JQUERY_MEDIA_CLASS_MEDIA_DEFAULT', '.filefield-file a');
 define('JQUERY_MEDIA_CLASS_MEDIA_AUTOINVOKE_DEFAULT', TRUE);
 define('JQUERY_MEDIA_MEDIA_WIDTH_DEFAULT', '');
Index: jquery_media.settings.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/jquery_media/jquery_media.settings.inc,v
retrieving revision 1.5.2.6
diff -u -p -r1.5.2.6 jquery_media.settings.inc
--- jquery_media.settings.inc	28 Aug 2008 01:47:17 -0000	1.5.2.6
+++ jquery_media.settings.inc	23 Jan 2009 22:56:25 -0000
@@ -122,6 +122,12 @@ function _jquery_media_settings_form() {
     '#default_value' => variable_get('jquery_media_flvplayer', JQUERY_MEDIA_FLVPLAYER_DEFAULT),
     '#description' => t('Enter the path relative to your webroot to your flash video player, such as for the JW Media Player or Wimpy Rave. Do not include the beginning slash.'),
   );
+  $form['players']['jquery_media_mp4_flash'] = array(
+    '#type' => 'checkbox',
+    '#title' => t('Play MP4 Files with Flash Player'),
+    '#default_value' => variable_get('jquery_media_mp4_flash', JQUERY_MEDIA_MP4_FLASH_DEFAULT),
+    '#description' => t('If checked, then MP4 files will be treated like FLV files and played with the Flash Video Player rather than a video plugin such as QuickTime. Flash is more widely deployed than QuickTime, but has stricter encoding requirements. Don\'t enable this unless all your MP4 files are encoded to Adobe\'s Flash specifications (i.e. h.264 + AAC).'),
+  );
   $form['players']['jquery_media_mp3player'] = array(
     '#type' => 'textfield',
     '#title' => t('MP3 Player (%mp3Player)', array('%mp3Player' => 'mp3Player')),