Merge pull request #11176 from jbeich/ffmpeg

Work around video corruption with system FFmpeg >= 3.1
This commit is contained in:
Henrik Rydgård authored and GitHub committed 2018-06-13 14:52:20 +02:00
commit 0fd4ea8826
1 file changed
+8
+8
View File
@@ -455,6 +455,14 @@ bool MediaEngine::setVideoStream(int streamNum, bool force) {
return false;
}
AVCodecContext *m_pCodecCtx = m_pFormatCtx->streams[streamNum]->codec;
#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(57,33,100)
AVCodecParameters *m_pCodecPar = m_pFormatCtx->streams[streamNum]->codecpar;
// Update from deprecated public codec context
if (avcodec_parameters_from_context(m_pCodecPar, m_pCodecCtx) < 0) {
return false;
}
#endif
// Find the decoder for the video stream
AVCodec *pCodec = avcodec_find_decoder(m_pCodecCtx->codec_id);