Permalink
Browse files

Merge pull request #11176 from jbeich/ffmpeg

Work around video corruption with system FFmpeg >= 3.1
  • Loading branch information...
hrydgard committed Jun 13, 2018
2 parents 5c5fa8d + 7a7c655 commit 0fd4ea8826a0a11fc67bd438a53ea234a9b217ae
Showing with 8 additions and 0 deletions.
  1. +8 −0 Core/HW/MediaEngine.cpp
View
@@ -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);

0 comments on commit 0fd4ea8

Please sign in to comment.