Merge pull request #6558 from lletourn:master

53468709 · Alexander Alekhin · 639c8fc6 · c03d778e · 53468709
Commit 53468709 authored Jun 30, 2016 by Alexander Alekhin
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

cap_ffmpeg_impl.hpp modules/videoio/src/cap_ffmpeg_impl.hpp +2 -1

No files found.
--- a/modules/videoio/src/cap_ffmpeg_impl.hpp
+++ b/modules/videoio/src/cap_ffmpeg_impl.hpp
@@ -971,7 +971,8 @@ bool CvCapture_FFMPEG::grabFrame()
        {
            //picture_pts = picture->best_effort_timestamp;
            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++;
            valid = true;
        }