Fixing conflicts

This commit is contained in:
Aaron Scherer
2016-02-12 13:08:03 -08:00
8 changed files with 24 additions and 20 deletions

View File

@@ -67,6 +67,7 @@ export default class AudioEncoder {
'-i', '-',
'-f', 's16le',
'-ar', '48000',
'-ss', (options.seek || 0),
'-ac', 2,
'pipe:1'
], {stdio: ['pipe', 'pipe', 'ignore']});
@@ -102,6 +103,7 @@ export default class AudioEncoder {
'-i', file,
'-f', 's16le',
'-ar', '48000',
'-ss', (options.seek || 0),
'-ac', 2,
'pipe:1'
], {stdio: ['pipe', 'pipe', 'ignore']});