Merge branch 'master' into dev

thepag · thepag · commit dcbdc522f2d3 · 2014-08-01T17:01:36.000+01:00
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
 	"name": "jPlayer",
-	"version": "2.6.3",
+	"version": "2.6.4",
 	"main": [
 		"./jquery.jplayer/jquery.jplayer.js",
 		"./skin/pink.flag/jplayer.pink.flag.css"
diff --git a/jplayer.jquery.json b/jplayer.jquery.json
@@ -11,7 +11,7 @@
 		"html5",
 		"streaming"
 	],
-	"version": "2.6.3",
+	"version": "2.6.4",
 	"author": {
 		"name": "Mark J Panaghiston",
 		"email": "markp@happyworm.com",
diff --git a/jquery.jplayer/jquery.jplayer.js b/jquery.jplayer/jquery.jplayer.js
@@ -7,8 +7,8 @@
  * http://opensource.org/licenses/MIT
  *
  * Author: Mark J Panaghiston
- * Version: 2.6.3
- * Date: 30th May 2014
+ * Version: 2.6.4
+ * Date: 1st August 2014
  */
 
 /* Code verified using http://www.jshint.com/ */
@@ -479,7 +479,7 @@
 	$.jPlayer.prototype = {
 		count: 0, // Static Variable: Change it via prototype.
 		version: { // Static Object
-			script: "2.6.3",
+			script: "2.6.4",
 			needFlash: "2.6.0",
 			flash: "unknown"
 		},
@@ -711,7 +711,7 @@
 		// 'MPEG-4 support' : canPlayType('video/mp4; codecs="mp4v.20.8"')
 		format: { // Static Object
 			mp3: {
-				codec: 'audio/mpeg; codecs="mp3"',
+				codec: 'audio/mpeg',
 				flashCanPlay: true,
 				media: 'audio'
 			},
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jplayer",
-  "version": "2.6.3",
+  "version": "2.6.4",
   "description": "The jQuery HTML5 Audio / Video Library",
   "homepage": "http://www.jplayer.org/",
   "keywords": [

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "jPlayer",`
`3`		`- "version": "2.6.3",`
	`3`	`+ "version": "2.6.4",`
`4`	`4`	`"main": [`
`5`	`5`	`"./jquery.jplayer/jquery.jplayer.js",`
`6`	`6`	`"./skin/pink.flag/jplayer.pink.flag.css"`