Merge branch 'upstream-master'

2018-08-09 09:58:57 -07:00
parent f41831ceac 7dc9e85793
commit 5b3f08781e
11 changed files with 200 additions and 49 deletions
--- a/Video.js
+++ b/Video.js
@@ -350,6 +350,12 @@ Video.propTypes = {
  paused: PropTypes.bool,
  muted: PropTypes.bool,
  volume: PropTypes.number,
+  bufferConfig: PropTypes.shape({
+    minBufferMs: PropTypes.number,
+    maxBufferMs: PropTypes.number,
+    bufferForPlaybackMs: PropTypes.number,
+    bufferForPlaybackAfterRebufferMs: PropTypes.number,
+  }),
  stereoPan: PropTypes.number,
  rate: PropTypes.number,
  playInBackground: PropTypes.bool,