diff --git a/src/media/media_encoder.cpp b/src/media/media_encoder.cpp
index 3c8e39b532be4a9cc98713dbd6e3e36897cd8b34..9d2505a8c0013b29e152820089cecb741be289fe 100644
--- a/src/media/media_encoder.cpp
+++ b/src/media/media_encoder.cpp
@@ -181,11 +181,10 @@ MediaEncoder::openOutput(const char *filename,
         av_opt_set_int(encoderCtx_->priv_data, "error-resilient", 1, 0);
         av_opt_set_int(encoderCtx_->priv_data, "cpu-used", 3, 0);
         av_opt_set_int(encoderCtx_->priv_data, "lag-in-frames", 0, 0);
+        // don't set encoderCtx_->gop_size: let libvpx decide when to insert a keyframe
         encoderCtx_->slices = 2; // VP8E_SET_TOKEN_PARTITIONS
         encoderCtx_->qmin = 4;
         encoderCtx_->qmax = 56;
-        encoderCtx_->gop_size = 999999;
-
         encoderCtx_->rc_buffer_size = maxBitrate;
         encoderCtx_->bit_rate = maxBitrate;
         if (crf != SystemCodecInfo::DEFAULT_NO_QUALITY) {
diff --git a/src/media/video/video_input.cpp b/src/media/video/video_input.cpp
index 0e67ce0c7a99fb8fac298387cf3c80357841909b..1c986067575fed04603c149091b32d7a6c78e345 100644
--- a/src/media/video/video_input.cpp
+++ b/src/media/video/video_input.cpp
@@ -57,7 +57,7 @@ VideoInput::VideoInput()
             std::bind(&VideoInput::process, this),
             std::bind(&VideoInput::cleanup, this))
 #if defined(__ANDROID__) || defined(RING_UWP)
-    , mutex_(), frame_cv_(), buffers_(8)
+    , mutex_(), frame_cv_(), buffers_()
 #endif
 {}
 
diff --git a/src/media/video/video_input.h b/src/media/video/video_input.h
index 7ffeefbb0dce7772cdd6279472633deaf1081a58..323792661afbcf2bb8d87a9c5082addbaa423144 100644
--- a/src/media/video/video_input.h
+++ b/src/media/video/video_input.h
@@ -34,6 +34,7 @@
 #include <string>
 #include <mutex>
 #include <condition_variable>
+#include <array>
 
 namespace ring {
 class MediaDecoder;
@@ -132,7 +133,7 @@ private:
 
     /* Get notified when libav is done with this buffer */
     void releaseBufferCb(uint8_t* ptr);
-    std::vector<struct VideoFrameBuffer> buffers_;
+    std::array<struct VideoFrameBuffer, 8> buffers_;
 #endif
 };