From 9f06195b7392b9163a89ae72c32b00a67a9526aa Mon Sep 17 00:00:00 2001 From: "Devin J. Pohly" Date: Fri, 23 Aug 2013 00:00:00 -0400 Subject: [PATCH] FFmpeg: reinitialize m_fLastFrame in Init() After a Rewind(), the m_fLastFrame wasn't set back to 0. Now it is. --- src/arch/MovieTexture/MovieTexture_FFMpeg.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp b/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp index b9b7165723..64760ad4ca 100644 --- a/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp +++ b/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp @@ -113,8 +113,6 @@ MovieDecoder_FFMpeg::MovieDecoder_FFMpeg() m_pStream = NULL; m_iCurrentPacketOffset = -1; - m_fLastFrame = 0; - Init(); } @@ -152,9 +150,10 @@ void MovieDecoder_FFMpeg::Init() m_fPTS = -1; m_iFrameNumber = -1; /* decode one frame and you're on the 0th */ m_fTimestampOffset = 0; + m_fLastFrame = 0; m_swsctx = NULL; - m_avioContext = NULL; - m_buffer = NULL; + m_avioContext = NULL; + m_buffer = NULL; if( m_iCurrentPacketOffset != -1 ) {