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

avoid use of "AVFrame::best_effort_timestamp"

Browse Source
This commit is contained in:
Vadim Pisarevsky 2012-04-26 07:38:35 +00:00
parent d994923fec
commit fcbfc030ef
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/highgui/src/cap_ffmpeg_impl_v2.hpp
View File

@ -444,16 +444,16 @@ bool CvCapture_FFMPEG::grabFrame()
if (count_errs > max_number_of_attempts) if (count_errs > max_number_of_attempts)
break; break;
} }
// Decode video frame // Decode video frame
avcodec_decode_video2(video_st->codec, picture, &got_picture, &packet); avcodec_decode_video2(video_st->codec, picture, &got_picture, &packet);
// Did we get a video frame? // Did we get a video frame?
if(got_picture) if(got_picture)
{ {
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 : packet.dts; picture_pts = packet.pts != AV_NOPTS_VALUE_ && packet.pts != 0 ? packet.pts : packet.dts;
frame_number++; frame_number++;
valid = true; valid = true;
} }