Index: src/wp-includes/media.php
===================================================================
--- src/wp-includes/media.php	(revision 25419)
+++ src/wp-includes/media.php	(working copy)
@@ -865,8 +865,8 @@
 	foreach ( $default_types as $type )
 		$defaults_atts[$type] = '';
 
-	$atts = shortcode_atts( $defaults_atts, $attr, 'audio' );
-	extract( $atts );
+	$shortcode_atts = shortcode_atts( $defaults_atts, $attr, 'audio' );
+	extract( $shortcode_atts );
 
 	$primary = false;
 	if ( ! empty( $src ) ) {
@@ -944,7 +944,7 @@
 		$html .= wp_mediaelement_fallback( $fileurl );
 	$html .= '</audio>';
 
-	return apply_filters( 'wp_audio_shortcode', $html, $atts, $audio, $post_id, $library );
+	return apply_filters( 'wp_audio_shortcode', $html, $atts, $audio, $post_id, $library, $shortcode_atts );
 }
 add_shortcode( 'audio', apply_filters( 'wp_audio_shortcode_handler', 'wp_audio_shortcode' ) );
 
@@ -992,8 +992,8 @@
 	foreach ( $default_types as $type )
 		$defaults_atts[$type] = '';
 
-	$atts = shortcode_atts( $defaults_atts, $attr, 'video' );
-	extract( $atts );
+	$shortcode_atts = shortcode_atts( $defaults_atts, $attr, 'video' );
+	extract( $shortcode_atts );
 
 	$w = $width;
 	$h = $height;
@@ -1088,7 +1088,7 @@
 	$html .= '</video>';
 
 	$html = sprintf( '<div style="width: %dpx; max-width: 100%%;">%s</div>', $width, $html );
-	return apply_filters( 'wp_video_shortcode', $html, $atts, $video, $post_id, $library );
+	return apply_filters( 'wp_video_shortcode', $html, $atts, $video, $post_id, $library, $shortcode_atts );
 }
 add_shortcode( 'video', apply_filters( 'wp_video_shortcode_handler', 'wp_video_shortcode' ) );