Index: wp-includes/js/mediaelement/wp-mediaelement.js
===================================================================
--- wp-includes/js/mediaelement/wp-mediaelement.js	(revision 24804)
+++ wp-includes/js/mediaelement/wp-mediaelement.js	(working copy)
@@ -6,5 +6,4 @@
     $(function () {
 		$('.wp-audio-shortcode, .wp-video-shortcode').mediaelementplayer();
 	});
-
 }(jQuery));
\ No newline at end of file
Index: wp-includes/media.php
===================================================================
--- wp-includes/media.php	(revision 24804)
+++ wp-includes/media.php	(working copy)
@@ -860,7 +860,9 @@
 		'src'      => '',
 		'loop'     => '',
 		'autoplay' => '',
-		'preload' => 'none'
+		'preload'  => 'none',
+		'width'    => empty( $content_width ) ? 640 : $content_width
+
 	);
 	foreach ( $default_types as $type )
 		$defaults_atts[$type] = '';
@@ -872,7 +874,7 @@
 	if ( ! empty( $src ) ) {
 		$type = wp_check_filetype( $src );
 		if ( ! in_array( $type['ext'], $default_types ) )
-			return sprintf( '<a class="wp-post-format-link-audio" href="%s">%s</a>', esc_url( $src ), esc_html( $src ) );
+			return sprintf( '<a class="wp-media-embedded wp-audio" href="%s">%s</a>', esc_url( $src ), esc_html( $src ) );
 		$primary = true;
 		array_unshift( $default_types, 'src' );
 	} else {
@@ -902,6 +904,7 @@
 	if ( 'mediaelement' === $library && did_action( 'init' ) ) {
 		wp_enqueue_style( 'wp-mediaelement' );
 		wp_enqueue_script( 'wp-mediaelement' );
+		wp_localize_script( 'wp_mediaelement', 'mediaelementArgs', array( 'maxWidth' => $max_width ));
 	}
 
 	$atts = array(
@@ -1007,7 +1010,7 @@
 	if ( ! empty( $src ) ) {
 		$type = wp_check_filetype( $src );
 		if ( ! in_array( $type['ext'], $default_types ) )
-			return sprintf( '<a class="wp-post-format-link-video" href="%s">%s</a>', esc_url( $src ), esc_html( $src ) );
+			return sprintf( '<a class="wp-media-embedded wp-video" href="%s">%s</a>', esc_url( $src ), esc_html( $src ) );
 		$primary = true;
 		array_unshift( $default_types, 'src' );
 	} else {
@@ -1037,6 +1040,8 @@
 	if ( 'mediaelement' === $library && did_action( 'init' ) ) {
 		wp_enqueue_style( 'wp-mediaelement' );
 		wp_enqueue_script( 'wp-mediaelement' );
+		wp_localize_script( 'wp_mediaelement', 'mediaelementArgs', array( 'width' => $width ));
+
 	}
 
 	$atts = array(