Skip to content

Commit

Permalink
handle 'abort' errors in ffmpeg.js plugin (#482)
Browse files Browse the repository at this point in the history
  • Loading branch information
thijstriemstra committed Jun 14, 2020
1 parent 1f6a41c commit 705d236
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

## 4.1.0 - unreleased

- ffmpeg.js plugin: handle `abort` errors (#481)
- Bump required version for webrtc-adapter to 7.6.1


Expand Down
3 changes: 2 additions & 1 deletion src/js/plugins/ffmpegjs-plugin.js
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,8 @@ class FFmpegjsEngine extends ConvertEngine {
case 'exit':
break;

// error occured
// FFmpeg terminated abnormally (e.g. out of memory, wasm error)
case 'abort':
case 'error':
this.player().trigger('error', msg.data);
break;
Expand Down

0 comments on commit 705d236

Please sign in to comment.