diff options
| author | Benoit Bolsee <benoit.bolsee@online.be> | 2010-03-29 00:12:28 +0400 |
|---|---|---|
| committer | Benoit Bolsee <benoit.bolsee@online.be> | 2010-03-29 00:12:28 +0400 |
| commit | 9792d39ab42ffe33d4fec7918cf59c3072f40522 (patch) | |
| tree | 5ed4d0d1234a630a51412b36e241e94284dd64b8 /source/gameengine | |
| parent | 982886d34e978b9069b7be0048cc131f47f2b13f (diff) | |
VideoTexture: clean previous commit.
Diffstat (limited to 'source/gameengine')
| -rw-r--r-- | source/gameengine/VideoTexture/VideoFFmpeg.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/source/gameengine/VideoTexture/VideoFFmpeg.cpp b/source/gameengine/VideoTexture/VideoFFmpeg.cpp index 939cd54500a..290af8e63c5 100644 --- a/source/gameengine/VideoTexture/VideoFFmpeg.cpp +++ b/source/gameengine/VideoTexture/VideoFFmpeg.cpp @@ -298,7 +298,6 @@ int VideoFFmpeg::openStream(const char *filename, AVInputFormat *inputFormat, AV */ 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 @@ void *VideoFFmpeg::cacheThread(void *data) 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 @@ void *VideoFFmpeg::cacheThread(void *data) // 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); |