2.8 branch: This is part II of the new ply plugin. This commit merges the following trunk revisions: 10088, 10149, and 11237

2010-03-17 19:02:38 +00:00
parent bdcba7220c
commit 5c70f4828f
2 changed files with 6 additions and 4 deletions
--- a/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp
+++ b/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp
@@ -167,7 +167,9 @@ void FFmpegDecoderVideo::decodeLoop()

            // Find out the frame pts

-            if (packet.packet.dts == AV_NOPTS_VALUE && m_frame->opaque != 0 && *reinterpret_cast<const int64_t*>(m_frame->opaque) != AV_NOPTS_VALUE)
+            if (packet.packet.dts == AV_NOPTS_VALUE &&
+                m_frame->opaque != 0 &&
+                *reinterpret_cast<const int64_t*>(m_frame->opaque) != AV_NOPTS_VALUE)
            {
                pts = *reinterpret_cast<const int64_t*>(m_frame->opaque);
            }