diff --git a/typo3/sysext/cms/tslib/content/class.tslib_content_media.php b/typo3/sysext/cms/tslib/content/class.tslib_content_media.php
index 5b2fefc1b5f10578ab86cd2f83365f1ae3a39b01..0959135a8a08e1acc8e16864ca783ad2f6dda85e 100644
--- a/typo3/sysext/cms/tslib/content/class.tslib_content_media.php
+++ b/typo3/sysext/cms/tslib/content/class.tslib_content_media.php
@@ -185,16 +185,39 @@ class tslib_content_Media extends tslib_content_Abstract {
 			}
 		}
 
-		switch ($renderType) {
-			case 'swf' :
-				$conf[$conf['type'] . '.'] = array_merge((array) $conf['mimeConf.']['swfobject.'][$conf['type'] . '.'], $typeConf);
+		if ($renderType !== 'qt' && $renderType !== 'embed') {
+			if (isset($conf['file']) && (
+					strpos($conf['file'], '.swf') !== FALSE ||
+					(strpos($conf['file'], '://') !== FALSE) && strpos(t3lib_div::getUrl($conf['file'], 2), 'application/x-shockwave-flash') !== false)
+			) {
 				$conf = array_merge((array) $conf['mimeConf.']['swfobject.'], $conf);
+				$conf[$conf['type'] . '.']['player'] = strpos($conf['file'], '://') === FALSE ? 'http://' . $conf['file'] : $conf['file'];
+				$conf['installUrl'] = 'null';
+				$conf['forcePlayer'] = 0;
+				$renderType = 'swf';
+			} elseif (isset($conf['file']) && !isset($conf['caption']) && !isset($conf['sources'])) {
+				$renderType = 'swf';
+				$conf['forcePlayer'] = 1;
+			}
+		}
+
+		switch ($renderType) {
+			case 'flowplayer':
+				$conf[$conf['type'] . '.'] = array_merge((array) $conf['mimeConf.']['flowplayer.'][$conf['type'] . '.'], $typeConf);
+				$conf = array_merge((array) $conf['mimeConf.']['flowplayer.'], $conf);
 				unset($conf['mimeConf.']);
 				$conf['attributes.'] = array_merge((array) $conf['attributes.'], $conf['predefined']);
 				$conf['params.'] = array_merge((array) $conf['params.'], $conf['predefined']);
 				$conf['flashvars.'] = array_merge((array) $conf['flashvars.'], $conf['predefined']);
 				$content = $this->cObj->FLOWPLAYER($conf);
 			break;
+			case 'swf':
+				$conf[$conf['type'] . '.'] = array_merge((array) $conf['mimeConf.']['swfobject.'][$conf['type'] . '.'], $typeConf);
+				$conf = array_merge((array) $conf['mimeConf.']['swfobject.'], $conf);
+				unset($conf['mimeConf.']);
+				$conf['flashvars.'] = array_merge((array) $conf['flashvars.'], $conf['predefined']);
+				$content = $this->cObj->SWFOBJECT($conf);
+			break;
 			case 'qt' :
 				$conf[$conf['type'] . '.'] = array_merge($conf['mimeConf.']['swfobject.'][$conf['type'] . '.'], $typeConf);
 				$conf = array_merge($conf['mimeConf.']['qtobject.'], $conf);
@@ -225,7 +248,6 @@ class tslib_content_Media extends tslib_content_Abstract {
 					$content = $this->cObj->stdWrap($content, $conf['stdWrap.']);
 				}
 		}
-
 		return $content;
 	}
 
diff --git a/typo3/sysext/css_styled_content/static/constants.txt b/typo3/sysext/css_styled_content/static/constants.txt
index 70a6a63ee211c6d117adb8eabab607eb43811f77..ae44637e42ca1690631ec43918be72bd8d65c2b0 100644
--- a/typo3/sysext/css_styled_content/static/constants.txt
+++ b/typo3/sysext/css_styled_content/static/constants.txt
@@ -120,17 +120,19 @@ styles.content.searchresult {
 
 styles.content.media {
     # cat=content/cMedia/j1; type=; label= Video Player: configure the path to the video player
-  videoPlayer = typo3/contrib/flowplayer/flowplayer-3.2.7.swf
+  videoPlayer = typo3/contrib/flashmedia/flvplayer.swf
     # cat=content/cMedia/j2; type=int+; label= Media Video Width: define the default width for the media video
   defaultVideoWidth = 600
   	# cat=content/cMedia/j3; type=int+; label= Media Video Height: define the default height for the media video
   defaultVideoHeight = 400
     # cat=content/cMedia/j4; type=; label= Audio Player: configure the path to the video player
-  audioPlayer = typo3/contrib/flowplayer/flowplayer-3.2.7.swf
+  audioPlayer = typo3/contrib/flashmedia/player.swf
    	# cat=content/cMedia/j5; type=int+; label= Media Audio Width: define the default width for the media audio
   defaultAudioWidth = 300
     # cat=content/cMedia/j6; type=int+; label= Media Audio Height: define the default height for the media audio
-  defaultAudioHeight = 26
+  defaultAudioHeight = 30
+   	# cat=content/cMedia/j7; type=; label= Flow Player: configure the path to the flow-player
+  flowPlayer = typo3/contrib/flowplayer/flowplayer-3.2.7.swf
 }
 
 styles.content.table {
diff --git a/typo3/sysext/css_styled_content/static/setup.txt b/typo3/sysext/css_styled_content/static/setup.txt
index 88e5d63a3bde3acf662fdfcfdd3a1b9b41f33c14..23afb545d8629d05872d3b3f17941651e5c323ad 100644
--- a/typo3/sysext/css_styled_content/static/setup.txt
+++ b/typo3/sysext/css_styled_content/static/setup.txt
@@ -1496,11 +1496,11 @@ tt_content.media {
 			asf = MEDIA
 			class = MEDIA
 			wmv = MEDIA
-			mp3 = SWF
-			mp4 = SWF
-			m4v = SWF
-			swa = SWF
-			flv = SWF
+			mp3 = FLOWPLAYER
+			mp4 = FLOWPLAYER
+			m4v = FLOWPLAYER
+			swa = FLOWPLAYER
+			flv = FLOWPLAYER
 			swf = SWF
 			mov = QT
 			m4v = QT
@@ -1509,6 +1509,9 @@ tt_content.media {
 
 		mimeConf.swfobject < tt_content.swfobject.20
 		mimeConf.qtobject < tt_content.qtobject.20
+		mimeConf.flowplayer < tt_content.swfobject.20
+		mimeConf.flowplayer.audio.player = {$styles.content.media.flowPlayer}
+		mimeConf.flowplayer.video.player = {$styles.content.media.flowPlayer}
 
 	}
 	20.stdWrap {