From 5c70f4828fc233c44ef74f74ff06ce5431111214 Mon Sep 17 00:00:00 2001 From: Paul MARTZ Date: Wed, 17 Mar 2010 19:02:38 +0000 Subject: [PATCH] 2.8 branch: This is part II of the new ply plugin. This commit merges the following trunk revisions: 10088, 10149, and 11237 --- src/osgPlugins/3ds/readwrite.cpp | 6 +++--- src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/osgPlugins/3ds/readwrite.cpp b/src/osgPlugins/3ds/readwrite.cpp index f23b939b8..3f0d3aede 100644 --- a/src/osgPlugins/3ds/readwrite.cpp +++ b/src/osgPlugins/3ds/readwrite.cpp @@ -373,7 +373,7 @@ Lib3dsBool lib3ds_intb_write(Lib3dsIntb b, iostream *strm) { ASSERT(strm); - strm->write((char*)b,1); + strm->write((const char*)b,1); if (strm->fail()) { return(LIB3DS_FALSE); } @@ -400,7 +400,7 @@ lib3ds_intw_write(Lib3dsIntw w, iostream *strm) b[1]=(Lib3dsByte)(((Lib3dsWord)w & 0xFF00) >> 8); b[0]=(Lib3dsByte)((Lib3dsWord)w & 0x00FF); - strm->write((char*)b,2); + strm->write((const char*)b,2); if (strm->fail()) { return(LIB3DS_FALSE); } @@ -429,7 +429,7 @@ lib3ds_intd_write(Lib3dsIntd d, iostream *strm) b[1]=(Lib3dsByte)(((Lib3dsDword)d & 0x0000FF00) >> 8); b[0]=(Lib3dsByte)(((Lib3dsDword)d & 0x000000FF)); - strm->write((char*)b,4); + strm->write((const char*)b,4); if (strm->fail()) { return(LIB3DS_FALSE); } diff --git a/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp b/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp index 6744fe3e5..2982d70c1 100644 --- 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(m_frame->opaque) != AV_NOPTS_VALUE) + if (packet.packet.dts == AV_NOPTS_VALUE && + m_frame->opaque != 0 && + *reinterpret_cast(m_frame->opaque) != AV_NOPTS_VALUE) { pts = *reinterpret_cast(m_frame->opaque); }