Initialise ffmpeg libavformat in spdif muxer constructor.

SPDIFEncoder requires libavformat to be properly initialised, so do so in the constructor.
MythTV · Dec 23, 2010 · fc5f185 · fc5f185
1 parent 7295e55
commit fc5f185
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/mythtv/libs/libmyth/spdifencoder.cpp b/mythtv/libs/libmyth/spdifencoder.cpp
@@ -1,5 +1,7 @@
 #include "config.h"
 
+#include "mythcorecontext.h"
+
 #include "compat.h"
 #include "spdifencoder.h"
 #include "mythverbose.h"
@@ -22,7 +24,7 @@ SPDIFEncoder::SPDIFEncoder(QString muxer, AVCodecContext *ctx)
     QByteArray dev_ba     = muxer.toAscii();
     AVOutputFormat *fmt;
 
-    if (!(av_guess_format && avformat_alloc_context &&
+    if (!(av_register_all && av_guess_format && avformat_alloc_context &&
           av_new_stream && av_write_header && av_write_frame &&
           av_write_trailer && av_set_parameters))
     {
@@ -42,6 +44,10 @@ SPDIFEncoder::SPDIFEncoder(QString muxer, AVCodecContext *ctx)
         return;
     }
 
+    avcodeclock->lock();
+    av_register_all();
+    avcodeclock->unlock();
+
     fmt = av_guess_format(dev_ba.constData(), NULL, NULL);
     if (!fmt)
     {

diff --git a/mythtv/libs/libmyth/spdifencoder.h b/mythtv/libs/libmyth/spdifencoder.h
@@ -11,6 +11,7 @@ extern "C" {
 #include "libavcodec/audioconvert.h"
 }
 
+#pragma weak av_register_all
 #pragma weak av_guess_format
 #pragma weak avformat_alloc_context
 #pragma weak av_new_stream