mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-07 05:15:34 +00:00
Code Issues Releases Wiki Activity

Merge branch 'fix-ffmpeg-api-const' into 'master'

Browse source 
Fix future FFMpeg API changes

See merge request OpenMW/openmw!922

(cherry picked from commit 3794e6d4b2)

70a02290 Fix future FFMpeg API changes
This commit is contained in:
psi29a 2021-06-19 00:15:16 +00:00
parent 7be09078b4
commit 5a27d6eed7
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwsound/ffmpeg_decoder.cpp
View file

@ -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 " +

2
extern/osg-ffmpeg-videoplayer/audiodecoder.cpp vendored
View file

@ -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 " +

2
extern/osg-ffmpeg-videoplayer/videostate.cpp vendored
View file

@ -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<int>(pFormatCtx->nb_streams))
return -1;