diff --git a/sites/all/modules/contrib/flowplayer/flowplayer.js b/sites/all/modules/contrib/flowplayer/flowplayer.js
index cf4a992..84b82af 100644
--- a/sites/all/modules/contrib/flowplayer/flowplayer.js
+++ b/sites/all/modules/contrib/flowplayer/flowplayer.js
@@ -84,6 +84,8 @@ Drupal.behaviors.flowplayer = function() {
     }
 
     // Create the flowplayer element on the non-processed elements.
-    $(selector + ':not(.flowplayer-processed)').addClass('flowplayer-processed').flowplayer(Drupal.settings.basePath + Drupal.settings.flowplayerSwf, config);
+    $(selector + ':not(.flowplayer-processed)')
+      .addClass('flowplayer-processed')
+      .flowplayer(Drupal.settings.flowplayerSwf, config);
   });
 };
diff --git a/sites/all/modules/contrib/flowplayer/flowplayer.module b/sites/all/modules/contrib/flowplayer/flowplayer.module
index be65f07..4316ffa 100644
--- a/sites/all/modules/contrib/flowplayer/flowplayer.module
+++ b/sites/all/modules/contrib/flowplayer/flowplayer.module
@@ -87,9 +87,11 @@ function flowplayer_add($selector = NULL, $config = NULL) {
     drupal_add_js(drupal_get_path('module', 'flowplayer') .'/flowplayer/flowplayer.min.js');
     drupal_add_css(drupal_get_path('module', 'flowplayer') .'/flowplayer.css');
 
+    $file_create_url = (module_exists('cdn')) ? 'file_create_url' : 'url';
+    
     // Tell the JavaScript where flowplayer.swf is.
     $settings = array(
-      'flowplayerSwf' => drupal_get_path('module', 'flowplayer') .'/flowplayer/flowplayer.swf',
+      'flowplayerSwf' => $file_create_url(drupal_get_path('module', 'flowplayer') .'/flowplayer/flowplayer.swf'),
     );
     drupal_add_js($settings, 'setting');
     $flowplayer_added = TRUE;