diff --git a/src/video/ffmpeg.c b/src/video/ffmpeg.c
index 2f26fff..f6251e9 100644
--- a/src/video/ffmpeg.c
+++ b/src/video/ffmpeg.c
@@ -49,6 +49,9 @@ enum decoders ffmpeg_decoder;
 int ffmpeg_init(int videoFormat, int width, int height, int perf_lvl, int buffer_count, int thread_count) {
   // Initialize the avcodec library and register codecs
   av_log_set_level(AV_LOG_QUIET);
+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(58,10,100)
+  avcodec_register_all();
+#endif
 
   av_init_packet(&pkt);
 
diff --git a/third_party/moonlight-common-c b/third_party/moonlight-common-c
index 6bb60b1..470d057 160000
--- a/third_party/moonlight-common-c
+++ b/third_party/moonlight-common-c
@@ -1 +1 @@
-Subproject commit 6bb60b19775bae2097855bd5d67aed2d7e023dfe
+Subproject commit 470d057a252c0af7fc04be39eee3426de79bc3dc