actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

FFMpeg: Fix uninitialized AVFrame

Browse Source 
Fixes crashes with recent version of libav and ffmpeg on Linux while attempting to play a video
This commit is contained in:
Vincent Laviron
2015-10-04 22:21:06 +02:00
parent c79dd4ba5c
commit 85599a7a43
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/arch/MovieTexture/MovieTexture_FFMpeg.cpp
+6 -5
View File
@@ -112,6 +112,7 @@ MovieDecoder_FFMpeg::MovieDecoder_FFMpeg()
m_fctx = NULL; m_fctx = NULL;
m_pStream = NULL; m_pStream = NULL;
m_iCurrentPacketOffset = -1; m_iCurrentPacketOffset = -1;
m_Frame = avcodec::av_frame_alloc();
Init(); Init();
} }
@@ -265,7 +266,7 @@ int MovieDecoder_FFMpeg::DecodePacket( float fTargetTime )
m_Packet.data = m_Packet.size ? m_Packet.data : NULL; m_Packet.data = m_Packet.size ? m_Packet.data : NULL;
int len = avcodec::avcodec_decode_video2( int len = avcodec::avcodec_decode_video2(
m_pStream->codec, m_pStream->codec,
&m_Frame, &iGotFrame, m_Frame, &iGotFrame,
&m_Packet ); &m_Packet );
if( len < 0 ) if( len < 0 )
@@ -283,9 +284,9 @@ int MovieDecoder_FFMpeg::DecodePacket( float fTargetTime )
continue; continue;
} }
if( m_Frame.pkt_dts != AV_NOPTS_VALUE ) if( m_Frame->pkt_dts != AV_NOPTS_VALUE )
{ {
m_fTimestamp = (float) (m_Frame.pkt_dts * av_q2d(m_pStream->time_base)); m_fTimestamp = (float) (m_Frame->pkt_dts * av_q2d(m_pStream->time_base));
} }
else else
{ {
@@ -296,7 +297,7 @@ int MovieDecoder_FFMpeg::DecodePacket( float fTargetTime )
/* Length of this frame: */ /* Length of this frame: */
m_fLastFrameDelay = (float) av_q2d(m_pStream->time_base); m_fLastFrameDelay = (float) av_q2d(m_pStream->time_base);
m_fLastFrameDelay += m_Frame.repeat_pict * (m_fLastFrameDelay * 0.5f); m_fLastFrameDelay += m_Frame->repeat_pict * (m_fLastFrameDelay * 0.5f);
++m_iFrameNumber; ++m_iFrameNumber;
@@ -347,7 +348,7 @@ void MovieDecoder_FFMpeg::GetFrame( RageSurface *pSurface )
} }
avcodec::sws_scale( m_swsctx, avcodec::sws_scale( m_swsctx,
m_Frame.data, m_Frame.linesize, 0, GetHeight(), m_Frame->data, m_Frame->linesize, 0, GetHeight(),
pict.data, pict.linesize ); pict.data, pict.linesize );
} }
src/arch/MovieTexture/MovieTexture_FFMpeg.h
+1 -1
View File
@@ -63,7 +63,7 @@ private:
int DecodePacket( float fTargetTime ); int DecodePacket( float fTargetTime );
avcodec::AVStream *m_pStream; avcodec::AVStream *m_pStream;
avcodec::AVFrame m_Frame; avcodec::AVFrame *m_Frame;
avcodec::PixelFormat m_AVTexfmt; /* PixelFormat of output surface */ avcodec::PixelFormat m_AVTexfmt; /* PixelFormat of output surface */
avcodec::SwsContext *m_swsctx; avcodec::SwsContext *m_swsctx;