avoid use of "AVFrame::best_effort_timestamp"

fcbfc030 · Vadim Pisarevsky · d994923f · fcbfc030
Commit fcbfc030 authored Apr 26, 2012 by Vadim Pisarevsky
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

cap_ffmpeg_impl_v2.hpp modules/highgui/src/cap_ffmpeg_impl_v2.hpp +2 -2

No files found.
--- a/modules/highgui/src/cap_ffmpeg_impl_v2.hpp
+++ b/modules/highgui/src/cap_ffmpeg_impl_v2.hpp
@@ -451,9 +451,9 @@ bool CvCapture_FFMPEG::grabFrame()
        // Did we get a video frame?
        if(got_picture)
        {
-            picture_pts = picture->best_effort_timestamp;
+            //picture_pts = picture->best_effort_timestamp;
            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++;
            valid = true;
        }