Put av_register_all() in the right place.

diff --git a/src/lib/ffmpeg.cc b/src/lib/ffmpeg.cc
index ce87cc14f2d7801f2974202008012f624b09d1ae..2038d6a8590f2e6df8a2d9c7301ac92251be05c4 100644 (file)
--- 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 b1dfeab558421d3406d5535ad3022e2d63409687..0ce538cdff2429fbd4f571a57e14e292faddef8e 100644 (file)
--- 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