Skip to content

Commit 49ce97b

Browse files
thepagthepag
committed
Fix RTMP video size issue. As per jplayer#131 and jplayer#98.
1 parent d602779 commit 49ce97b

5 files changed

Lines changed: 14 additions & 14 deletions

File tree

‎actionscript/Jplayer.as‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
/*
22
* jPlayer Plugin for jQuery JavaScript Library
3-
* http://www.happyworm.com/jquery/jplayer
3+
* http://www.jplayer.org
44
*
5-
* Copyright (c) 2009 - 2012 Happyworm Ltd
5+
* Copyright (c) 2009 - 2013 Happyworm Ltd
66
* Dual licensed under the MIT and GPL licenses.
77
* - http://www.opensource.org/licenses/mit-license.php
88
* - http://www.gnu.org/copyleft/gpl.html
99
*
1010
* Author: Mark J Panaghiston
11-
* Version: 2.2.0
12-
* Date: 13th August 2012
11+
* Version: 2.2.18
12+
* Date: 28th January 2013
1313
*
1414
* FlashVars expected: (AS3 property of: loaderInfo.parameters)
1515
* id: (URL Encoded: String) Id of jPlayer instance
@@ -120,7 +120,7 @@ package {
120120
var myContextMenu:ContextMenu = new ContextMenu();
121121
myContextMenu.hideBuiltInItems();
122122
var menuItem_jPlayer:ContextMenuItem = new ContextMenuItem("jPlayer " + JplayerStatus.VERSION);
123-
var menuItem_happyworm:ContextMenuItem = new ContextMenuItem("© 2009-2012 Happyworm Ltd", true);
123+
var menuItem_happyworm:ContextMenuItem = new ContextMenuItem("© 2009-2013 Happyworm Ltd", true);
124124
menuItem_jPlayer.addEventListener(ContextMenuEvent.MENU_ITEM_SELECT, menuSelectHandler_jPlayer);
125125
menuItem_happyworm.addEventListener(ContextMenuEvent.MENU_ITEM_SELECT, menuSelectHandler_happyworm);
126126
myContextMenu.customItems.push(menuItem_jPlayer, menuItem_happyworm);

‎actionscript/happyworm/jPlayer/JplayerRtmp.as‎

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎actionscript/happyworm/jPlayer/JplayerStatus.as‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
/*
22
* jPlayer Plugin for jQuery JavaScript Library
3-
* http://www.happyworm.com/jquery/jplayer
3+
* http://www.jplayer.org
44
*
5-
* Copyright (c) 2009 - 2012 Happyworm Ltd
5+
* Copyright (c) 2009 - 2013 Happyworm Ltd
66
* Dual licensed under the MIT and GPL licenses.
77
* - http://www.opensource.org/licenses/mit-license.php
88
* - http://www.gnu.org/copyleft/gpl.html
99
*
1010
* Author: Mark J Panaghiston
11-
* Date: 13th September 2012
11+
* Date: 28th January 2013
1212
*/
1313

1414
package happyworm.jPlayer {
1515
public class JplayerStatus {
1616

17-
public static const VERSION:String = "2.2.0"; // The version of the Flash jPlayer entity.
17+
public static const VERSION:String = "2.2.18"; // The version of the Flash jPlayer entity.
1818

1919
public var volume:Number = 0.5; // Not affected by reset()
2020
public var muted:Boolean = false; // Not affected by reset()

‎jquery.jplayer/Jplayer.swf‎

-1 Bytes
Binary file not shown.

‎jquery.jplayer/jquery.jplayer.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
* - http://www.gnu.org/copyleft/gpl.html
99
*
1010
* Author: Mark J Panaghiston
11-
* Version: 2.2.17
12-
* Date: 24th January 2013
11+
* Version: 2.2.18
12+
* Date: 28th January 2013
1313
*/
1414

1515
/* Code verified using http://www.jshint.com/ */
@@ -454,8 +454,8 @@
454454
$.jPlayer.prototype = {
455455
count: 0, // Static Variable: Change it via prototype.
456456
version: { // Static Object
457-
script: "2.2.17",
458-
needFlash: "2.2.0",
457+
script: "2.2.18",
458+
needFlash: "2.2.18",
459459
flash: "unknown"
460460
},
461461
options: { // Instanced in $.jPlayer() constructor

0 commit comments

Comments
 (0)