[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27812] trunk/blender/source/gameengine/ VideoTexture/VideoFFmpeg.cpp: VideoTexture: clean previous commit.
Benoit Bolsee
benoit.bolsee at online.be
Sun Mar 28 22:12:28 CEST 2010
Revision: 27812
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27812
Author: ben2610
Date: 2010-03-28 22:12:28 +0200 (Sun, 28 Mar 2010)
Log Message:
-----------
VideoTexture: clean previous commit.
Modified Paths:
--------------
trunk/blender/source/gameengine/VideoTexture/VideoFFmpeg.cpp
Modified: trunk/blender/source/gameengine/VideoTexture/VideoFFmpeg.cpp
===================================================================
--- trunk/blender/source/gameengine/VideoTexture/VideoFFmpeg.cpp 2010-03-28 20:08:16 UTC (rev 27811)
+++ trunk/blender/source/gameengine/VideoTexture/VideoFFmpeg.cpp 2010-03-28 20:12:28 UTC (rev 27812)
@@ -298,7 +298,6 @@
*/
void *VideoFFmpeg::cacheThread(void *data)
{
- static int count=0;
VideoFFmpeg* video = (VideoFFmpeg*)data;
// holds the frame that is being decoded
CacheFrame *currentFrame = NULL;
@@ -307,7 +306,6 @@
int frameFinished = 0;
double timeBase = av_q2d(video->m_formatCtx->streams[video->m_videoStream]->time_base);
int64_t startTs = video->m_formatCtx->streams[video->m_videoStream]->start_time;
- long pts;
if (startTs == AV_NOPTS_VALUE)
startTs = 0;
@@ -399,7 +397,6 @@
// move frame to queue, this frame is necessarily the next one
video->m_curPosition = (long)((cachePacket->packet.dts-startTs) * (video->m_baseFrameRate*timeBase) + 0.5);
currentFrame->framePosition = video->m_curPosition;
- pts = (long)((cachePacket->packet.pts-startTs) * (video->m_baseFrameRate*timeBase) + 0.5);
pthread_mutex_lock(&video->m_cacheMutex);
BLI_addtail(&video->m_frameCacheBase, currentFrame);
pthread_mutex_unlock(&video->m_cacheMutex);
More information about the Bf-blender-cvs
mailing list