remove libavformat/url.h from most headers

I'm not sure how to remove it from avformatdecoder.h since it is not a pointer. It appears to only be used in avformatdecoder.cpp in one place. mythavformatbuffer: convert private class static into file static. Somewhat hack-y, but equivalent.
MythTV · Feb 10, 2022 · b17a958 · b17a958
1 parent c177c31
commit b17a958
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 15 deletions.
diff --git a/mythtv/libs/libmythtv/decoders/avformatdecoder.h b/mythtv/libs/libmythtv/decoders/avformatdecoder.h
@@ -7,6 +7,8 @@
 extern "C" {
 #include "libavcodec/avcodec.h"
 #include "libavformat/avformat.h"
+
+#include "libavformat/url.h"
 }
 
 #include <QString>

diff --git a/mythtv/libs/libmythtv/io/mythavformatbuffer.cpp b/mythtv/libs/libmythtv/io/mythavformatbuffer.cpp
@@ -2,7 +2,13 @@
 #include "io/mythavformatbuffer.h"
 #include "mythcorecontext.h"
 
-URLProtocol MythAVFormatBuffer::s_avfrURL;
+// FFmpeg
+extern "C" {
+#include "libavformat/avformat.h"
+#include "libavformat/url.h"
+}
+
+static URLProtocol s_avfrURL {};
 
 MythAVFormatBuffer::MythAVFormatBuffer(MythMediaBuffer *Buffer)
   : m_buffer(Buffer)

diff --git a/mythtv/libs/libmythtv/io/mythavformatbuffer.h b/mythtv/libs/libmythtv/io/mythavformatbuffer.h
@@ -4,11 +4,9 @@
 // MythTV
 #include "io/mythmediabuffer.h"
 
-// FFmpeg
-extern "C" {
-#include "libavformat/avformat.h"
-#include "libavformat/url.h"
-}
+// forward declare internal FFmpeg structs from "libavformat/url.h"
+struct URLContext;
+struct URLProtocol;
 
 class MythAVFormatBuffer
 {
@@ -31,6 +29,5 @@ class MythAVFormatBuffer
   private:
     MythMediaBuffer    *m_buffer       { nullptr };
     bool                m_initState    { true    };
-    static URLProtocol  s_avfrURL;
 };
 #endif
diff --git a/mythtv/libs/libmythtv/io/mythavformatwriter.cpp b/mythtv/libs/libmythtv/io/mythavformatwriter.cpp
@@ -19,6 +19,15 @@
  */
 #include "io/mythavformatwriter.h"
 
+// FFmpeg
+extern "C" {
+#include "libavutil/opt.h"
+#include "libavutil/samplefmt.h"
+#include "libavutil/imgutils.h"
+
+#include "libavformat/url.h"
+}
+
 #include <QtGlobal>
 #include <QtEndian>
 
@@ -28,14 +37,6 @@
 #include "audiooutpututil.h"
 #include "mythavutil.h"
 
-
-// FFmpeg
-extern "C" {
-#include "libavutil/opt.h"
-#include "libavutil/samplefmt.h"
-#include "libavutil/imgutils.h"
-}
-
 #define LOC QString("AVFW(%1): ").arg(m_filename)
 #define LOC_ERR QString("AVFW(%1) Error: ").arg(m_filename)
 #define LOC_WARN QString("AVFW(%1) Warning: ").arg(m_filename)