generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #6558 from lletourn:master

Browse Source
This commit is contained in:
Alexander Alekhin 2016-06-30 13:44:16 +00:00
commit 5346870920
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/videoio/src/cap_ffmpeg_impl.hpp
View File

@ -971,7 +971,8 @@ bool CvCapture_FFMPEG::grabFrame()
{ {
//picture_pts = picture->best_effort_timestamp; //picture_pts = picture->best_effort_timestamp;
if( picture_pts == AV_NOPTS_VALUE_ ) if( picture_pts == AV_NOPTS_VALUE_ )
picture_pts = packet.pts != AV_NOPTS_VALUE_ && packet.pts != 0 ? packet.pts : packet.dts; picture_pts = picture->pkt_pts != AV_NOPTS_VALUE_ && picture->pkt_pts != 0 ? picture->pkt_pts : picture->pkt_dts;
frame_number++; frame_number++;
valid = true; valid = true;
} }