Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/issue64' into print
Browse files Browse the repository at this point in the history
  • Loading branch information
cconcolato committed Apr 9, 2018
2 parents c79c478 + ff816c5 commit 2adfbf1
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions src/mp4box.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*
/*
* Copyright (c) 2012-2013. Telecom ParisTech/TSI/MM/GPAC Cyril Concolato
* License: BSD-3-Clause (see LICENSE file)
*/
var MP4Box = {}
var MP4Box = {};

MP4Box.createFile = function (_keepMdatData, _stream) {
/* Boolean indicating if bytes containing media data should be kept in memory */
Expand All @@ -13,5 +13,5 @@ MP4Box.createFile = function (_keepMdatData, _stream) {
}

if (typeof exports !== 'undefined') {
exports.createFile = MP4Box.createFile;
exports.createFile = MP4Box.createFile;
}
2 changes: 1 addition & 1 deletion test/node/fragment.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ mp4boxfile.onReady = function (info) {
}
}

mp4boxfile.onSegment = function (id, user, arrayBuffer, sampleNum) {
mp4boxfile.onSegment = function (id, user, arrayBuffer, sampleNum) {
console.log("New segment created for track "+id+", up to sample "+sampleNum);
out.write(toBuffer(arrayBuffer));
}
Expand Down

0 comments on commit 2adfbf1

Please sign in to comment.