mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-21 09:39:56 +00:00
Code Issues Projects Releases Wiki Activity

Restore compatibility with FFMpeg < 57.80.100

Browse Source 
This should fix macOS Travis build broken by 58d33aa95b729d81c236a587b59352c6a7c7f017
This commit is contained in:
Gleb Mazovetskiy 2021-03-08 19:29:34 +00:00
parent deb184cdce
commit 1db7d2ec4e
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/openmw/mwsound/ffmpeg_decoder.cpp
View File

@ -304,7 +304,11 @@ void FFmpeg_Decoder::close()
{
av_freep(&mFormatCtx->pb->buffer);
}
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 80, 100)
avio_context_free(&mFormatCtx->pb);
#else
av_freep(&mFormatCtx->pb);
#endif
}
avformat_close_input(&mFormatCtx);
}

12
extern/osg-ffmpeg-videoplayer/videostate.cpp vendored
View File

@ -710,12 +710,20 @@ void VideoState::init(std::shared_ptr<std::istream> inputstream, const std::stri
if (this->format_ctx->pb != nullptr)
{
av_freep(&this->format_ctx->pb->buffer);
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 80, 100)
avio_context_free(&this->format_ctx->pb);
#else
av_freep(&this->format_ctx->pb);
#endif
}
}
// "Note that a user-supplied AVFormatContext will be freed on failure."
this->format_ctx = nullptr;
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 80, 100)
avio_context_free(&ioCtx);
#else
av_freep(&ioCtx);
#endif
throw std::runtime_error("Failed to open video input");
}
@ -790,7 +798,11 @@ void VideoState::deinit()
if (this->format_ctx->pb != nullptr)
{
av_freep(&this->format_ctx->pb->buffer);
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 80, 100)
avio_context_free(&this->format_ctx->pb);
#else
av_freep(&this->format_ctx->pb);
#endif
}
avformat_close_input(&this->format_ctx);
}