Skip to content
This repository has been archived by the owner on Dec 10, 2020. It is now read-only.

Added context menu and hid built-in items #1

Merged
merged 1 commit into from
Dec 28, 2011
Merged

Added context menu and hid built-in items #1

merged 1 commit into from
Dec 28, 2011

Conversation

mchristopher
Copy link

Added context menu to swf and hid built-in Flash content menu items to prevent users from messing with stuff

alemay added a commit that referenced this pull request Dec 28, 2011
@alemay
Merge pull request #1 from zencoder/add-context-menu
ad17e83 
Added context menu and hid built-in items
@alemay alemay merged commit ad17e83 into master Dec 28, 2011
@gkatsev gkatsev deleted the add-context-menu branch July 19, 2014 01:20
gesinger pushed a commit to gesinger/video-js-swf that referenced this pull request Dec 6, 2016
@dmlap
Merge pull request videojs#1 from mjneil/flashls-master
3314452 
emit id3tag events
mjneil referenced this pull request in brightcove/videojs-flashls-swf Jul 19, 2017
Squashed commit of the following:
f0fce3f 
commit f54c89b
Author: David LaPalomento <dlapalomento@gmail.com>
Date:   Fri Dec 9 16:39:22 2016 -0500

    5.1.1-2

commit 7330197
Author: David LaPalomento <dlapalomento@gmail.com>
Date:   Fri Dec 9 16:39:00 2016 -0500

    Update SWF for v5.1.1-2

commit edede92
Merge: 74b2693 5844f87
Author: David LaPalomento <dlapalomento@gmail.com>
Date:   Fri Dec 9 16:14:06 2016 -0500

    Merge pull request #3 from gesinger/trigger-playing-hlsprovider

    Trigger playing events from HLSProvider

commit 5844f87
Author: Garrett Singer <gesinger@gmail.com>
Date:   Fri Dec 9 14:02:39 2016 -0500

    Update video-js.swf

commit 97445f6
Author: Garrett Singer <gesinger@gmail.com>
Date:   Fri Dec 9 13:45:40 2016 -0500

    Trigger playing events from HLSProvider

commit 74b2693
Merge: 3314452 dd30114
Author: David LaPalomento <dlapalomento@gmail.com>
Date:   Thu Dec 8 17:15:43 2016 -0500

    Merge pull request #2 from gesinger/flashls-master-captions-2

    Listen to HLSProvider captiondata events and fire externally

commit dd30114
Author: Garrett Singer <gesinger@gmail.com>
Date:   Wed Dec 7 16:21:37 2016 -0500

    Account for live sliding window in HLSProvider time and buffered

commit 4d547ae
Author: Garrett Singer <gesinger@gmail.com>
Date:   Tue Dec 6 18:53:15 2016 -0500

    Listen to HLSProvider captiondata events and fire externally

commit 3314452
Merge: 5830d3d 3d7b708
Author: David LaPalomento <dlapalomento@gmail.com>
Date:   Tue Dec 6 17:19:42 2016 -0500

    Merge pull request #1 from mjneil/flashls-master

    emit id3tag events

commit 3d7b708
Author: Matthew Neil <mneil@mneil-retina-2016.vidmark.local>
Date:   Tue Dec 6 17:15:25 2016 -0500

    emit id3tag events

commit 5830d3d
Merge: 74f3ad4 8e55ad1
Author: David LaPalomento <dlapalomento@gmail.com>
Date:   Fri Dec 2 22:39:40 2016 -0500

    Merge branch 'master' into flashls-master

commit 74f3ad4
Merge: 42c21ee b678e60
Author: Guillaume du Pontavice <g.du.pontavice@gmail.com>
Date:   Thu Jan 7 12:05:25 2016 +0100

    Merge pull request #9 from raytiley/5.0.1-sync

    Updates from video-js-swf 5.0.1

commit b678e60
Author: raytiley <raytiley@gmail.com>
Date:   Tue Dec 8 11:58:37 2015 -0500

    Fix buffered implementation

commit 0114771
Merge: 42c21ee e467712
Author: raytiley <raytiley@gmail.com>
Date:   Tue Dec 8 10:24:59 2015 -0500

    Merge upstream changes from videojs-swf 5.0.1

    There was an interface change to `get:buffered()`. I honestly have no idea if I implemented it correctly, I just got it to compile. Still haven't tested the binary with latest videojs yet. Will do that soon and will report back. Just wanted to get this up here incase someone could identify any major mistakes I made.

commit 42c21ee
Merge: 031ce7e aeab894
Author: Guillaume du Pontavice <g.du.pontavice@gmail.com>
Date:   Thu Jun 25 11:20:08 2015 +0200

    Merge pull request #7 from Wellming/master

    merge video-js-swf v4.7.1

commit aeab894
Author: Wellming Li <wellming.li@howzhi.com>
Date:   Wed Jun 24 22:26:29 2015 +0800

    update dist

commit c82cb8a
Merge: 031ce7e 504c517
Author: Wellming Li <wellming.li@howzhi.com>
Date:   Wed Jun 24 17:08:12 2015 +0800

    merge video-js-swf v4.7.1

commit 031ce7e
Merge: 56141bb 3fbe5e4
Author: Guillaume du Pontavice <g.du.pontavice@gmail.com>
Date:   Tue Jun 23 09:51:19 2015 +0200

    Merge pull request #6 from MeteorMag/flashls-test

    Flashls Update

commit 3fbe5e4
Author: mslanza <mslanza@gmail.com>
Date:   Fri Jun 19 18:51:31 2015 -0400

    Test

commit 84ead90
Author: mslanza <mslanza@gmail.com>
Date:   Fri Jun 19 18:48:58 2015 -0400

    Test

commit 2438a9f
Author: mslanza <mslanza@gmail.com>
Date:   Fri Jun 19 18:13:31 2015 -0400

    Test

commit 416f6f6
Author: mslanza <mslanza@gmail.com>
Date:   Fri Jun 19 17:59:41 2015 -0400

    Test

commit 8ec0a7c
Author: tonyv <openunderground@gmail.com>
Date:   Fri Jun 19 16:24:48 2015 -0400

    log out custom HLS settings

commit cbf8a8a
Author: tonyv <openunderground@gmail.com>
Date:   Fri Jun 19 15:39:52 2015 -0400

    update info log with flashls version

commit 46ce7a7
Author: tonyv <openunderground@gmail.com>
Date:   Fri Jun 19 15:17:01 2015 -0400

    flashls v4.1.1

commit cadf6a8
Author: tonyv <openunderground@gmail.com>
Date:   Fri Jun 19 14:57:26 2015 -0400

    update settings

commit 55e1d33
Author: tonyv <openunderground@gmail.com>
Date:   Tue Jun 16 16:56:43 2015 -0400

    use flashls lib v0.4.1.0, enable hardware decoding

commit 56141bb
Merge: 41410ed 7a9370e
Author: Guillaume du Pontavice <g.du.pontavice@gmail.com>
Date:   Tue May 12 22:13:23 2015 +0200

    Merge pull request #5 from EduSoho/master

    update video-js-swf to v4.6.1, and update flashls to v0.4.0.6.

commit 7a9370e
Author: Wellming Li <wellming.li@howzhi.com>
Date:   Mon May 11 03:07:10 2015 +0800

    fix mangui/flashls#226

commit 04b2670
Author: Wellming Li <wellming.li@howzhi.com>
Date:   Mon May 11 01:15:39 2015 +0800

    update flashls to version v0.4.0.6

commit 84aec09
Merge: 41410ed fd1f993
Author: Wellming Li <wellming.li@howzhi.com>
Date:   Mon May 11 00:49:32 2015 +0800

    merge with video-js-swf v4.6.1

commit 41410ed
Author: mangui <g.du.pontavice@gmail.com>
Date:   Mon Jan 26 23:59:30 2015 +0100

    update to flashls v0.3.5

commit 3b711e5
Author: mangui <g.du.pontavice@gmail.com>
Date:   Fri Nov 21 16:33:54 2014 +0100

    update to flashls v0.3.4

commit e6235a9
Author: mangui <g.du.pontavice@gmail.com>
Date:   Fri Nov 14 17:50:25 2014 +0100

    notify seeking/seeked event to JS
    related to mangui/flashls#139

commit 44cc6f0
Author: mangui <g.du.pontavice@gmail.com>
Date:   Thu Nov 6 11:41:17 2014 +0100

    Sends level info to "levelswitch" JS event
    related to mangui#4

commit bebb34c
Author: mangui <g.du.pontavice@gmail.com>
Date:   Thu Oct 30 14:44:39 2014 +0100

    don't fire ON_RESUME event after calling play/resume
    related to mangui/flashls#115

commit de9d7b3
Author: mangui <g.du.pontavice@gmail.com>
Date:   Fri Oct 24 15:34:52 2014 +0200

    update to flashls 0.3.3

commit e8b78be
Author: mangui <g.du.pontavice@gmail.com>
Date:   Fri Oct 24 15:18:22 2014 +0200

    align with https://github.com/videojs/video-js-swf/releases/tag/v4.5.1

commit 06441aa
Author: mangui <g.du.pontavice@gmail.com>
Date:   Fri Oct 17 10:53:15 2014 +0200

    update to flashls 0.3.2

commit e594560
Author: Guillaume du Pontavice <g.du.pontavice@gmail.com>
Date:   Thu Oct 9 10:23:26 2014 +0200

    update to flashls 0.3.1

commit bf5f380
Author: mangui <g.du.pontavice@gmail.com>
Date:   Tue Oct 7 16:54:28 2014 +0200

    fix video dimension issue
    related to mangui/flashls#86

commit c0ac259
Author: mangui <g.du.pontavice@gmail.com>
Date:   Fri Sep 26 15:03:01 2014 +0200

    update to flashls.swc v0.3.0
    fix mangui/flashls#73

commit 4f169e0
Author: mangui <g.du.pontavice@gmail.com>
Date:   Tue Aug 26 13:55:46 2014 +0200

    update swf

commit 27d7ce4
Author: mangui <g.du.pontavice@gmail.com>
Date:   Tue Aug 26 13:55:30 2014 +0200

    set stage to support level capping

commit a666035
Author: mangui <g.du.pontavice@gmail.com>
Date:   Tue Aug 26 13:54:02 2014 +0200

    update to flashls.swc v0.2.0

commit a6372f1
Author: mangui <g.du.pontavice@gmail.com>
Date:   Fri Aug 22 18:18:04 2014 +0200

    update swf following latest changes

commit 8c8aa02
Merge: cb92772 302fd0a
Author: Guillaume du Pontavice <g.du.pontavice@gmail.com>
Date:   Fri Aug 22 17:23:54 2014 +0200

    Merge pull request #3 from Hiroshi-p/master

    Hook up flashls level API as videojs custom SWF API.

commit 302fd0a
Author: Hiroshi Ohno <hohno@panopto.com>
Date:   Thu Aug 21 19:22:11 2014 -0700

    Propagate level switch event exeternally

commit 88ae036
Author: Hiroshi Ohno <hohno@panopto.com>
Date:   Tue Aug 5 23:33:55 2014 -0700

    Hook up flashls level API as videojs custom SWF API.

commit cb92772
Merge: f877a96 ab57f4b
Author: Guillaume du Pontavice <g.du.pontavice@gmail.com>
Date:   Thu Aug 7 12:52:20 2014 +0200

    Merge pull request #2 from Hiroshi-p/master

    Hook up flashls configuration options from flashVars of videojs.

commit ab57f4b
Author: Hiroshi Ohno <hohno@panopto.com>
Date:   Wed Aug 6 19:08:32 2014 -0700

    Hook up flashls configuration options from flashVars of videojs, take 2

commit 3d50246
Author: Hiroshi Ohno <hohno@panopto.com>
Date:   Tue Aug 5 23:07:46 2014 -0700

    Hook up flashls configuration options from flashVars of videojs.

commit f877a96
Author: Guillaume du Pontavice <g.du.pontavice@gmail.com>
Date:   Thu Jul 17 17:30:32 2014 +0200

    update to videojs-swf 4.4.2 to be compatible with videojs 4.6.x
    support live badge on UI

commit a1d3c08
Author: Guillaume du Pontavice <g.du.pontavice@gmail.com>
Date:   Wed Jul 9 19:17:26 2014 +0200

    update to flashls.swc v0.1.0

commit 73b5033
Author: mangui <g.du.pontavice@gmail.com>
Date:   Fri Jun 6 15:32:44 2014 +0800

    update to HLSProvider.swc v0.7.1

commit b72561a
Author: mangui <g.du.pontavice@gmail.com>
Date:   Mon May 19 17:03:51 2014 +0800

    update to HLSProvider.swc v0.7.0

commit 03be6a7
Author: mangui <g.du.pontavice@gmail.com>
Date:   Mon May 5 08:57:00 2014 +0800

    update to HLSProvider.swc v0.6.1

commit d8e7c15
Author: mangui <g.du.pontavice@gmail.com>
Date:   Thu Apr 17 10:16:17 2014 +0800

    force flush live URL
    related to mangui/HLSprovider#117

commit cadaf8f
Author: mangui <g.du.pontavice@gmail.com>
Date:   Thu Apr 17 09:42:23 2014 +0800

    update to HLSProvider.swc v0.5.7

commit 5849789
Author: mangui <g.du.pontavice@gmail.com>
Date:   Wed Mar 19 09:43:06 2014 +0800

    only report loadedmetadata once after manifest load
    related to videojs#85

commit c44be47
Author: mangui <g.du.pontavice@gmail.com>
Date:   Tue Mar 18 10:34:50 2014 +0800

    update to HLSProvider.swc v0.5.4

commit a1967aa
Author: mangui <g.du.pontavice@gmail.com>
Date:   Thu Feb 27 13:04:45 2014 +0800

    notify VideoPlaybackEvent.ON_VIDEO_DIMENSION_UPDATE as soon as we detect a video size change

commit d9cedbb
Author: mangui <g.du.pontavice@gmail.com>
Date:   Thu Feb 27 13:03:41 2014 +0800

    update to HLSProvider.swc v0.4.1
    https://github.com/mangui/HLSprovider/releases/tag/v0.4.1

commit f27b433
Author: mangui <g.du.pontavice@gmail.com>
Date:   Fri Feb 21 18:07:14 2014 +0800

    update player with video dimension before starting playback

commit 9691710
Author: mangui <g.du.pontavice@gmail.com>
Date:   Fri Feb 21 17:46:57 2014 +0800

    update to v0.3.7
    https://github.com/mangui/HLSprovider/releases/tag/v0.3.7

commit 45cba02
Author: mangui <g.du.pontavice@gmail.com>
Date:   Mon Feb 17 16:14:55 2014 +0800

    fix autoplay not hidding the play button

commit 930c2f6
Author: mangui <g.du.pontavice@gmail.com>
Date:   Mon Feb 17 15:20:49 2014 +0800

    various improvements/fixes
    bump to HLSProvider.swc v0.3.4
    report buffering event (spinner now displayed correctly)
    pause playback when completed to allow restarting it from beginning
    support "playback loop" option

commit e142246
Merge: d14258a fae029b
Author: mangui <g.du.pontavice@gmail.com>
Date:   Mon Feb 17 10:13:10 2014 +0800

    Merge branch 'master' of https://github.com/videojs/video-js-swf

commit d14258a
Author: mangui <g.du.pontavice@gmail.com>
Date:   Thu Jan 30 11:45:54 2014 +0800

    switch to HLSProvider 0.1.0 (the previous swc file was not tagged with a version number)
    fix grunt compilation
    adjust log level

commit 7e37108
Author: mangui <g.du.pontavice@gmail.com>
Date:   Mon Jan 27 01:15:50 2014 +0800

    commit updated swf file include HLS support

commit be10b06
Merge: c68fd4a 992164a
Author: mangui <g.du.pontavice@gmail.com>
Date:   Mon Jan 27 01:04:59 2014 +0800

    Merge remote-tracking branch 'remotes/upstream/master'

    Conflicts:
    	build.sh

commit c68fd4a
Author: mangui <g.du.pontavice@gmail.com>
Date:   Tue Jan 14 18:21:42 2014 +0800

    honour HTMLMediaElement readystate/networkstate
    create some const structs to deal with those variables
    notify errors to framework, if any
    report canplay after successful manifest load
    update HLSProvider.swc (mangui/HLSprovider@c2ef706)

commit c28b49b
Author: mangui <g.du.pontavice@gmail.com>
Date:   Mon Jan 13 13:37:35 2014 +0800

    fix video not displayed.
    an event was not triggered when playback starts.
    also fix buffer progress report.

commit 12cb9bc
Author: mangui <g.du.pontavice@gmail.com>
Date:   Thu Jan 9 18:51:07 2014 +0800

    first implementation
    link with HLSProvider.swc.
    when pressing play, playlist, and fragments are loaded, playback starts. audio is heard. but video is not displayed on screen.

commit 3300e83
Author: mangui <g.du.pontavice@gmail.com>
Date:   Thu Jan 9 15:21:32 2014 +0800

    add HLSProvider.as skeleton
    changes in VideoJSModel.as and PlaybackType.as inspired from hls-feature branch
mjneil pushed a commit to mjneil/video-js-swf that referenced this pull request Oct 12, 2017
@OshinKaramian
Merge pull request videojs#1 from brightcove/build-modifications
f649cb4
# for free to subscribe to this conversation on GitHub. Already have an account? #.
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@mchristopher @alemay