mythplugins: constify to satisfy -fpermissive

FFmpeg constified AVCodec* and others.
MythTV · Aug 25, 2022 · c6bc717 · c6bc717
1 parent b0960b7
commit c6bc717
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/mythplugins/mytharchive/mytharchive/remoteavformatcontext.h b/mythplugins/mytharchive/mytharchive/remoteavformatcontext.h
@@ -64,7 +64,7 @@ class RemoteAVFormatContext
             probe_data.buf_size = m_rf->Read(m_buffer, BUFFER_SIZE);
             probe_data.buf = m_buffer;
 
-            AVInputFormat *fmt = av_probe_input_format(&probe_data, 1);
+            const AVInputFormat *fmt = av_probe_input_format(&probe_data, 1);
             if (!fmt)
                 return false;
 

diff --git a/mythplugins/mytharchive/mytharchive/thumbfinder.h b/mythplugins/mytharchive/mytharchive/thumbfinder.h
@@ -79,7 +79,7 @@ class ThumbFinder : public MythScreenType
     RemoteAVFormatContext m_inputFC      {nullptr};
     AVCodecContext  *m_codecCtx          {nullptr};
     MythCodecMap     m_codecMap          {};
-    AVCodec         *m_codec             {nullptr};
+    const AVCodec   *m_codec             {nullptr};
     MythAVFrame      m_frame;
     MythAVCopy       m_copy;
 

diff --git a/mythplugins/mytharchive/mytharchivehelper/mytharchivehelper.cpp b/mythplugins/mytharchive/mytharchivehelper/mytharchivehelper.cpp
@@ -1608,7 +1608,7 @@ static int grabThumbnail(const QString& inFile, const QString& thumbList, const
     AVCodecContext *codecCtx = codecmap.GetCodecContext(inputFC->streams[videostream]);
 
     // get decoder for video stream
-    AVCodec * codec = avcodec_find_decoder(codecCtx->codec_id);
+    const AVCodec * codec = avcodec_find_decoder(codecCtx->codec_id);
 
     if (codec == nullptr)
     {

diff --git a/mythplugins/mythmusic/mythmusic/avfdecoder.cpp b/mythplugins/mythmusic/mythmusic/avfdecoder.cpp
@@ -330,7 +330,7 @@ bool avfDecoder::initialize()
 
     // let FFmpeg finds the best audio stream (should only be one), also catter
     // should the file/stream not be an audio one
-    AVCodec *codec = nullptr;
+    const AVCodec *codec = nullptr;
     int selTrack = av_find_best_stream(m_inputContext->getContext(), AVMEDIA_TYPE_AUDIO,
                                        -1, -1, &codec, 0);
 

diff --git a/mythplugins/mythmusic/mythmusic/avfdecoder.h b/mythplugins/mythmusic/mythmusic/avfdecoder.h
@@ -51,7 +51,7 @@ class avfDecoder : public QObject, public Decoder
 
     QString m_devicename;
 
-    AVInputFormat *m_inputFormat          {nullptr};
+    const AVInputFormat *m_inputFormat    {nullptr};
     RemoteAVFormatContext *m_inputContext {nullptr};
     AVCodecContext *m_audioDec            {nullptr};
     MythCodecMap m_codecMap               {};

diff --git a/mythplugins/mythmusic/mythmusic/remoteavformatcontext.h b/mythplugins/mythmusic/mythmusic/remoteavformatcontext.h
@@ -73,7 +73,7 @@ class RemoteAVFormatContext
             probe_data.buf_size = m_rf->Read(m_buffer, BUFFER_SIZE);
             probe_data.buf = m_buffer;
 
-            AVInputFormat *fmt = av_probe_input_format(&probe_data, 1);
+            const AVInputFormat *fmt = av_probe_input_format(&probe_data, 1);
             if (!fmt)
             {
                 LOG(VB_GENERAL, LOG_ERR,  QString("RemoteAVFormatContext::Open: Failed to probe file: %1").arg(filename));