From Alberto Luaces, "current versions of ffmpeg render «url_feof» macro as obsolete. The fix

is very simple and it is contained in the attached file."
This commit is contained in:
Robert Osfield 2013-09-05 08:42:00 +00:00
parent 73250601f0
commit 0d2825e06f

View File

@ -279,7 +279,7 @@ bool FFmpegDecoder::readNextPacketNormal()
int error = av_read_frame(m_format_context.get(), &packet);
if (error < 0)
{
if (error == AVERROR_EOF || url_feof(m_format_context.get()->pb))
if (error == AVERROR_EOF || m_format_context.get()->pb->eof_reached)
end_of_stream = true;
else {
OSG_FATAL << "av_read_frame() returned " << AvStrError(error) << std::endl;