FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed warnings

Browse Source
This commit is contained in:
Robert Osfield
2013-09-05 10:04:56 +00:00
parent 0d2825e06f
commit 19f84b52e7
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/osgPlugins/ffmpeg/FFmpegDecoder.cpp
View File

@@ -136,7 +136,7 @@ bool FFmpegDecoder::open(const std::string & filename, FFmpegParameters* paramet
throw std::runtime_error("av_find_stream_info() failed");
m_duration = double(m_format_context->duration) / AV_TIME_BASE;
if (m_format_context->start_time != AV_NOPTS_VALUE)
if (m_format_context->start_time != static_cast<int64_t>(AV_NOPTS_VALUE))
m_start = double(m_format_context->start_time) / AV_TIME_BASE;
else
m_start = 0;
@@ -265,8 +265,6 @@ inline void FFmpegDecoder::flushVideoQueue()
m_video_queue.flush(pc);
}
bool FFmpegDecoder::readNextPacketNormal()
{
AVPacket packet;
@@ -279,7 +277,8 @@ bool FFmpegDecoder::readNextPacketNormal()
int error = av_read_frame(m_format_context.get(), &packet);
if (error < 0)
{
if (error == AVERROR_EOF || m_format_context.get()->pb->eof_reached)
if (error == static_cast<int>(AVERROR_EOF) ||
m_format_context.get()->pb->eof_reached)
end_of_stream = true;
else {
OSG_FATAL << "av_read_frame() returned " << AvStrError(error) << std::endl;