From a335496e22993173dce367fb20ded1bf969188c1 Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Fri, 30 Jan 2015 12:17:53 +0100
Subject: [PATCH] OO-697: add mediaelementjs to list of licenses, add README to
 explain my changes to the javascript code

---
 NOTICE.TXT                          | 1 +
 src/main/webapp/static/movie/README | 6 ++++++
 2 files changed, 7 insertions(+)
 create mode 100644 src/main/webapp/static/movie/README

diff --git a/NOTICE.TXT b/NOTICE.TXT
index ee6bd8fe3ad..979fc0ee23b 100644
--- a/NOTICE.TXT
+++ b/NOTICE.TXT
@@ -129,6 +129,7 @@ This produce uses software based on the MIT License
 * html5shiv (MIT License / GPL2) [https://github.com/aFarkas/html5shiv]
 * respond.js (MIT License) [https://github.com/scottjehl/Respond]
 * Fuel UX (MIT License) [http://exacttarget.github.io/fuelux]
+* mediaelementjs (MIT License) [http://mediaelementjs.com]
 
 -----------------------------------------------------------------------
 This product uses software based on the BSD License
diff --git a/src/main/webapp/static/movie/README b/src/main/webapp/static/movie/README
new file mode 100644
index 00000000000..34aa7872f55
--- /dev/null
+++ b/src/main/webapp/static/movie/README
@@ -0,0 +1,6 @@
+The main library is MediaElement.js, there is a fallback the JWPlayer for some
+rtmp streams.
+
+mediaelement-and-player.min.js is slightly modified. At the beginning of the
+file, search for "audio/mp3","audio/m4a" and after add "audio/aac" to support
+AAC files
\ No newline at end of file
-- 
GitLab