From: Carl Hetherington <cth@carlh.net>
Date: Wed, 10 May 2017 12:53:28 +0000 (+0100)
Subject: Put av_register_all() in the right place.
X-Git-Tag: v2.11.4~26
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=fc4956d144ed0869fe2fa1737adc21104bb47836

Put av_register_all() in the right place.
---

diff --git a/src/lib/ffmpeg.cc b/src/lib/ffmpeg.cc
index ce87cc14f..2038d6a85 100644
--- a/src/lib/ffmpeg.cc
+++ b/src/lib/ffmpeg.cc
@@ -110,8 +110,6 @@ FFmpeg::ffmpeg_log_callback (void* ptr, int level, const char* fmt, va_list vl)
 void
 FFmpeg::setup_general ()
 {
-	av_register_all ();
-
 	/* This might not work too well in some cases of multiple FFmpeg decoders,
 	   but it's probably good enough.
 	*/
diff --git a/src/lib/util.cc b/src/lib/util.cc
index b1dfeab55..0ce538cdf 100644
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -44,6 +44,7 @@
 #include <dcp/subtitle_asset.h>
 extern "C" {
 #include <libavfilter/avfilter.h>
+#include <libavformat/avformat.h>
 #include <libavcodec/avcodec.h>
 }
 #include <curl/curl.h>
@@ -323,6 +324,7 @@ dcpomatic_setup ()
 	SetUnhandledExceptionFilter(exception_handler);
 #endif
 
+	av_register_all ();
 	avfilter_register_all ();
 
 #ifdef DCPOMATIC_OSX