Fixed shadows warnings

2016-05-26 08:25:12 +01:00
parent 95d8d7d993
commit bdad1f60c9
6 changed files with 23 additions and 18 deletions
--- a/src/osgPlugins/ffmpeg/FFmpegDecoder.cpp
+++ b/src/osgPlugins/ffmpeg/FFmpegDecoder.cpp
@@ -169,9 +169,9 @@ bool FFmpegDecoder::open(const std::string & filename, FFmpegParameters* paramet
        {
            m_audio_decoder.open(m_audio_stream, parameters);
        }
-        catch (const std::runtime_error & error)
+        catch (const std::runtime_error & rerror)
        {
-            OSG_WARN << "FFmpegImageStream::open audio failed, audio stream will be disabled: " << error.what() << std::endl;
+            OSG_WARN << "FFmpegImageStream::open audio failed, audio stream will be disabled: " << rerror.what() << std::endl;
        }
    }