mirror of
https://github.com/OpenMW/openmw.git
synced 2025-01-29 22:45:36 +00:00
Fix future FFMpeg API changes
avcodec_find_decoder now returns const AVCodec*.
This commit is contained in:
parent
b2791fd487
commit
70a0229010
3 changed files with 3 additions and 3 deletions
|
@ -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 " +
|
||||
|
|
|
@ -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
2
extern/osg-ffmpeg-videoplayer/videostate.cpp
vendored
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue