Skip to content

Commit

Permalink
Fixed HTML canPlayType test for MP3. Only use audio/mpeg. No codecs.
Browse files Browse the repository at this point in the history
  • Loading branch information
thepag committed Aug 1, 2014
1 parent 2cb72ad commit 4fe69b2
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion jplayer.jquery.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"html5",
"streaming"
],
"version": "2.6.3",
"version": "2.6.4",
"author": {
"name": "Mark J Panaghiston",
"email": "markp@happyworm.com",
Expand Down
8 changes: 4 additions & 4 deletions jquery.jplayer/jquery.jplayer.js
Original file line number Diff line number Diff line change
Expand Up @@ -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/ */
Expand Down Expand Up @@ -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"
},
Expand Down Expand Up @@ -702,7 +702,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'
},
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -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": [
Expand Down

0 comments on commit 4fe69b2

Please sign in to comment.