From 0d2825e06fdb390284bad3cf6723c69a535cf82f Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Thu, 5 Sep 2013 08:42:00 +0000 Subject: [PATCH] =?UTF-8?q?From=20Alberto=20Luaces,=20"current=20versions?= =?UTF-8?q?=20of=20ffmpeg=20render=20=C2=ABurl=5Ffeof=C2=BB=20macro=20as?= =?UTF-8?q?=20obsolete.=20=20The=20fix=20is=20very=20simple=20and=20it=20i?= =?UTF-8?q?s=20contained=20in=20the=20attached=20file."?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/osgPlugins/ffmpeg/FFmpegDecoder.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/osgPlugins/ffmpeg/FFmpegDecoder.cpp b/src/osgPlugins/ffmpeg/FFmpegDecoder.cpp index 497969f43..4ec9f1388 100644 --- a/src/osgPlugins/ffmpeg/FFmpegDecoder.cpp +++ b/src/osgPlugins/ffmpeg/FFmpegDecoder.cpp @@ -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;