From 5a27d6eed70b0e61883bb2b384c9969270892972 Mon Sep 17 00:00:00 2001 From: psi29a Date: Sat, 19 Jun 2021 00:15:16 +0000 Subject: [PATCH] Merge branch 'fix-ffmpeg-api-const' into 'master' Fix future FFMpeg API changes See merge request OpenMW/openmw!922 (cherry picked from commit 3794e6d4b20b6c9f47aeaf3f937118c49de700e5) 70a02290 Fix future FFMpeg API changes --- apps/openmw/mwsound/ffmpeg_decoder.cpp | 2 +- extern/osg-ffmpeg-videoplayer/audiodecoder.cpp | 2 +- extern/osg-ffmpeg-videoplayer/videostate.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/openmw/mwsound/ffmpeg_decoder.cpp b/apps/openmw/mwsound/ffmpeg_decoder.cpp index ec36a5cdf..0a9641635 100644 --- a/apps/openmw/mwsound/ffmpeg_decoder.cpp +++ b/apps/openmw/mwsound/ffmpeg_decoder.cpp @@ -221,7 +221,7 @@ void FFmpeg_Decoder::open(const std::string &fname) if(!mStream) throw std::runtime_error("No audio streams in "+fname); - AVCodec *codec = avcodec_find_decoder((*mStream)->codecpar->codec_id); + const AVCodec *codec = avcodec_find_decoder((*mStream)->codecpar->codec_id); if(!codec) { std::string ss = "No codec found for id " + diff --git a/extern/osg-ffmpeg-videoplayer/audiodecoder.cpp b/extern/osg-ffmpeg-videoplayer/audiodecoder.cpp index b5b3b8a3e..decf57e4d 100644 --- a/extern/osg-ffmpeg-videoplayer/audiodecoder.cpp +++ b/extern/osg-ffmpeg-videoplayer/audiodecoder.cpp @@ -71,7 +71,7 @@ MovieAudioDecoder::MovieAudioDecoder(VideoState* videoState) { mAudioResampler.reset(new AudioResampler()); - AVCodec *codec = avcodec_find_decoder(mAVStream->codecpar->codec_id); + const AVCodec *codec = avcodec_find_decoder(mAVStream->codecpar->codec_id); if(!codec) { std::string ss = "No codec found for id " + diff --git a/extern/osg-ffmpeg-videoplayer/videostate.cpp b/extern/osg-ffmpeg-videoplayer/videostate.cpp index c3cb412e9..7b4060753 100644 --- a/extern/osg-ffmpeg-videoplayer/videostate.cpp +++ b/extern/osg-ffmpeg-videoplayer/videostate.cpp @@ -632,7 +632,7 @@ bool VideoState::update() int VideoState::stream_open(int stream_index, AVFormatContext *pFormatCtx) { - AVCodec *codec; + const AVCodec *codec; if(stream_index < 0 || stream_index >= static_cast(pFormatCtx->nb_streams)) return -1;