diff options
author | psi29a <psi29a@gmail.com> | 2022-01-07 15:43:04 +0000 |
---|---|---|
committer | psi29a <psi29a@gmail.com> | 2022-01-07 15:43:04 +0000 |
commit | ceaa141cdfc0f868ffa1e8a020b265f95dfb9028 (patch) | |
tree | 4df8e102ba6cd8dfa56eed5bfadcb2a3fdc0e443 | |
parent | 011a26684abe172db5841e7761e350e3fe81b352 (diff) | |
parent | 6672014a518d01bc53a65aed770ba97726e77619 (diff) |
Merge branch 'this_and_that' into 'master'
make this great again
See merge request OpenMW/openmw!1539
-rw-r--r-- | extern/osg-ffmpeg-videoplayer/videostate.cpp | 12 |
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; |