From 69f8f8b7b74a8930de6915d43fa411f30d3ca8e8 Mon Sep 17 00:00:00 2001
From: rdb <git@rdb.name>
Date: Wed, 28 Nov 2018 16:22:27 +0100
Subject: [PATCH] ffmpeg: remove call deprecated in ffmpeg's libavformat
 58.9.100

---
 panda/src/ffmpeg/ffmpegVirtualFile.cxx | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/panda/src/ffmpeg/ffmpegVirtualFile.cxx b/panda/src/ffmpeg/ffmpegVirtualFile.cxx
index 8ca576cd90..09c5092844 100644
--- a/panda/src/ffmpeg/ffmpegVirtualFile.cxx
+++ b/panda/src/ffmpeg/ffmpegVirtualFile.cxx
@@ -189,7 +189,10 @@ register_protocol() {
   }
 
   // Here's a good place to call this global ffmpeg initialization function.
+  // However, ffmpeg (but not libav) deprecated this, hence this check.
+#if LIBAVFORMAT_VERSION_MICRO < 100 || LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(58, 9, 100)
   av_register_all();
+#endif
 
   // And this one.
   avformat_network_init();