From d16f11d7ca6975a2562c2c577dcc2e7ff90fbece Mon Sep 17 00:00:00 2001 From: David Hampton Date: Sun, 23 Oct 2022 14:52:34 -0400 Subject: [PATCH] =?UTF-8?q?Fix=20"marked=20=E2=80=98override=E2=80=99,=20b?= =?UTF-8?q?ut=20does=20not=20override"=20error=20message.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit One of the function arguments in the parent class of MythMMALContext was made const in c8bef3c5d5, and the change wasn't reflected in this class. --- mythtv/libs/libmythtv/decoders/mythmmalcontext.cpp | 2 +- mythtv/libs/libmythtv/decoders/mythmmalcontext.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mythtv/libs/libmythtv/decoders/mythmmalcontext.cpp b/mythtv/libs/libmythtv/decoders/mythmmalcontext.cpp index 201764fe5b4..adc56b51e3f 100644 --- a/mythtv/libs/libmythtv/decoders/mythmmalcontext.cpp +++ b/mythtv/libs/libmythtv/decoders/mythmmalcontext.cpp @@ -148,7 +148,7 @@ int MythMMALContext::HwDecoderInit(AVCodecContext *Context) return m_interop ? 0 : -1; } -void MythMMALContext::SetDecoderOptions(AVCodecContext *Context, AVCodec *Codec) +void MythMMALContext::SetDecoderOptions(AVCodecContext *Context, const AVCodec *Codec) { if (!(codec_is_mmal(m_codecID))) return; diff --git a/mythtv/libs/libmythtv/decoders/mythmmalcontext.h b/mythtv/libs/libmythtv/decoders/mythmmalcontext.h index 0f25d4daf42..f5017395cd2 100644 --- a/mythtv/libs/libmythtv/decoders/mythmmalcontext.h +++ b/mythtv/libs/libmythtv/decoders/mythmmalcontext.h @@ -20,7 +20,7 @@ class MythMMALContext : public MythCodecContext void InitVideoCodec (AVCodecContext *Context, bool SelectedStream, bool &DirectRendering) override; bool RetrieveFrame (AVCodecContext *Context, MythVideoFrame *Frame, AVFrame *AvFrame) override; int HwDecoderInit (AVCodecContext *Context) override; - void SetDecoderOptions (AVCodecContext *Context, AVCodec *Codec) override; + void SetDecoderOptions (AVCodecContext *Context, const AVCodec *Codec) override; static bool GetBuffer (AVCodecContext *Context, MythVideoFrame *Frame, AVFrame *AvFrame, int); bool GetBuffer2 (AVCodecContext *Context, MythVideoFrame *Frame, AVFrame *AvFrame, int); static enum AVPixelFormat GetFormat (AVCodecContext*, const AVPixelFormat *PixFmt);