Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Develop #170

Open
wants to merge 14 commits into
base: develop
Choose a base branch
from
Open

Develop #170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
df75ff0
Merge pull request #34 from brianchirls/develop
brianchirls Dec 3, 2013
17bea4d
Merge pull request #35 from brianchirls/develop
brianchirls Dec 4, 2013
7c9c641
Merge branch 'develop' - Hot fix
brianchirls Dec 4, 2013
393c132
Merge pull request #39 from brianchirls/develop
brianchirls Jan 15, 2014
422cc74
Merge pull request #52 from brianchirls/develop
brianchirls Apr 8, 2014
3b39bc0
Merge branch 'develop'
brianchirls Apr 8, 2014
3b8394b
Merge pull request #58 from brianchirls/develop
brianchirls May 6, 2014
7c6c9fb
Merge pull request #67 from brianchirls/develop
brianchirls Jul 25, 2014
63bf296
Merge pull request #73 from brianchirls/develop
brianchirls Oct 13, 2014
2fc0553
Merge pull request #74 from brianchirls/develop
brianchirls Oct 26, 2014
513d2b8
Merge pull request #103 from brianchirls/develop
brianchirls Sep 8, 2015
26c4163
Repair webcam streams by using srcObject rather than createObjectURL.
acjbizar Aug 3, 2019
ea7e102
Merge branch 'master' into develop
acjbizar Aug 3, 2019
24274a9
Repair webcam streams by using srcObject rather than createObjectURL.
acjbizar Aug 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/camera/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
if (video.mozCaptureStream) {
video.mozSrcObject = stream;
} else {
video.src = (URL && URL.createObjectURL(stream)) || stream;
video.srcObject = stream;
}
video.play();
},
Expand Down
7 changes: 1 addition & 6 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,12 +296,7 @@
target.width = video.videoWidth;
}

if (window.URL) {
video.src = window.URL.createObjectURL(stream);
} else {
video.src = stream;
}

video.srcObject = stream;
webCamStream = stream;

video.play();
Expand Down
2 changes: 1 addition & 1 deletion sources/seriously.camera.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
if (video.mozCaptureStream) {
video.mozSrcObject = stream;
} else {
video.src = (URL && URL.createObjectURL(stream)) || stream;
video.srcObject = stream;
}

if (video.readyState) {
Expand Down