From f88dddcab513966b44a1bb8264b1feec6f350dcf Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Sun, 11 Feb 2018 16:40:31 +0000
Subject: [PATCH] Media: Add `aac` to the list of allowed file types.

Props desrosj.
Fixes #42919.
Built from https://develop.svn.wordpress.org/trunk@42697


git-svn-id: http://core.svn.wordpress.org/trunk@42525 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/functions.php | 1 +
 wp-includes/media.php     | 4 ++--
 wp-includes/version.php   | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/wp-includes/functions.php b/wp-includes/functions.php
index f5a5642e17..cd74d5c1d8 100644
--- a/wp-includes/functions.php
+++ b/wp-includes/functions.php
@@ -2556,6 +2556,7 @@ function wp_get_mime_types() {
 			'dfxp'                         => 'application/ttaf+xml',
 			// Audio formats.
 			'mp3|m4a|m4b'                  => 'audio/mpeg',
+			'aac'                          => 'audio/aac',
 			'ra|ram'                       => 'audio/x-realaudio',
 			'wav'                          => 'audio/wav',
 			'ogg|oga'                      => 'audio/ogg',
diff --git a/wp-includes/media.php b/wp-includes/media.php
index 4f6061abbd..dcbf8a22ff 100644
--- a/wp-includes/media.php
+++ b/wp-includes/media.php
@@ -2243,9 +2243,9 @@ function wp_get_audio_extensions() {
 	 * @since 3.6.0
 	 *
 	 * @param array $extensions An array of supported audio formats. Defaults are
-	 *                          'mp3', 'ogg', 'flac', 'm4a', 'wav'.
+	 *                          'mp3', 'aac', 'ogg', 'flac', 'm4a', 'wav'.
 	 */
-	return apply_filters( 'wp_audio_extensions', array( 'mp3', 'ogg', 'flac', 'm4a', 'wav' ) );
+	return apply_filters( 'wp_audio_extensions', array( 'mp3', 'aac', 'ogg', 'flac', 'm4a', 'wav' ) );
 }
 
 /**
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 2e9f3c98fe..8cfb79c865 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.0-alpha-42696';
+$wp_version = '5.0-alpha-42697';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.