summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBret Curtis <bret.curtis@gmail.com>2022-01-06 15:02:24 +0100
committerBret Curtis <bret.curtis@gmail.com>2022-01-06 15:02:24 +0100
commit6672014a518d01bc53a65aed770ba97726e77619 (patch)
tree21d577ea78a0a1f75094c7f797319c2ebac819b0
parentd8d7a3b37291b9c87ada41131b19a60a0c80bb21 (diff)
make this great againthis_and_that
-rw-r--r--extern/osg-ffmpeg-videoplayer/videostate.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/extern/osg-ffmpeg-videoplayer/videostate.cpp b/extern/osg-ffmpeg-videoplayer/videostate.cpp
index ff1d9c6517..9b07ece14d 100644
--- a/extern/osg-ffmpeg-videoplayer/videostate.cpp
+++ b/extern/osg-ffmpeg-videoplayer/videostate.cpp
@@ -310,7 +310,7 @@ void VideoState::video_refresh()
VideoPicture* vp = &this->pictq[this->pictq_rindex];
this->video_display(vp);
- this->pictq_rindex = (pictq_rindex+1) % pictq.size();
+ this->pictq_rindex = (this->pictq_rindex+1) % this->pictq.size();
this->frame_last_pts = vp->pts;
this->pictq_size--;
this->pictq_cond.notify_one();
@@ -326,13 +326,13 @@ void VideoState::video_refresh()
int i=0;
for (; i<this->pictq_size-1; ++i)
{
- if (this->pictq[pictq_rindex].pts + threshold <= this->get_master_clock())
- this->pictq_rindex = (this->pictq_rindex+1) % pictq.size(); // not enough time to show this picture
+ if (this->pictq[this->pictq_rindex].pts + threshold <= this->get_master_clock())
+ this->pictq_rindex = (this->pictq_rindex+1) % this->pictq.size(); // not enough time to show this picture
else
break;
}
- assert (this->pictq_rindex < pictq.size());
+ assert (this->pictq_rindex < this->pictq.size());
VideoPicture* vp = &this->pictq[this->pictq_rindex];
this->video_display(vp);
@@ -342,7 +342,7 @@ void VideoState::video_refresh()
this->pictq_size -= i;
// update queue for next picture
this->pictq_size--;
- this->pictq_rindex = (this->pictq_rindex+1) % pictq.size();
+ this->pictq_rindex = (this->pictq_rindex+1) % this->pictq.size();
this->pictq_cond.notify_one();
}
}
@@ -392,7 +392,7 @@ int VideoState::queue_picture(const AVFrame &pFrame, double pts)
0, this->video_ctx->height, vp->rgbaFrame->data, vp->rgbaFrame->linesize);
// now we inform our display thread that we have a pic ready
- this->pictq_windex = (this->pictq_windex+1) % pictq.size();
+ this->pictq_windex = (this->pictq_windex+1) % this->pictq.size();
this->pictq_size++;
return 0;