@@ -82,22 +82,40 @@ void FileProperties::extractStreamProperties( IProgress& progress, const EAnalys
8282
8383// once the streams vectors are filled, add their references the base streams vector
8484for (size_t streamIndex =0 ; streamIndex < _videoStreams.size (); ++streamIndex )
85- _streams[ _videoStreams.at ( streamIndex ).getStreamIndex () ] = &_videoStreams.at ( streamIndex );
85+ {
86+ const size_t videoStreamIndex = _videoStreams.at ( streamIndex ).getStreamIndex ();
87+ _streams[ videoStreamIndex ] = &_videoStreams.at ( streamIndex );
88+ }
8689
8790for (size_t streamIndex =0 ; streamIndex < _audioStreams.size (); ++ streamIndex )
88- _streams[ _audioStreams.at (streamIndex).getStreamIndex () ] = &_audioStreams.at (streamIndex);
91+ {
92+ const size_t audioStreamIndex = _audioStreams.at ( streamIndex ).getStreamIndex ();
93+ _streams[ audioStreamIndex ] = &_audioStreams.at (streamIndex);
94+ }
8995
9096for (size_t streamIndex =0 ; streamIndex < _dataStreams.size (); ++ streamIndex )
91- _streams[ _dataStreams.at (streamIndex).getStreamIndex () ] = &_dataStreams.at (streamIndex);
97+ {
98+ const size_t dataStreamIndex = _dataStreams.at ( streamIndex ).getStreamIndex ();
99+ _streams[ dataStreamIndex ] = &_dataStreams.at (streamIndex);
100+ }
92101
93102for (size_t streamIndex =0 ; streamIndex < _subtitleStreams.size (); ++ streamIndex )
94- _streams[ _subtitleStreams.at (streamIndex).getStreamIndex () ] = &_subtitleStreams.at (streamIndex);
103+ {
104+ const size_t subtitleStreamIndex = _subtitleStreams.at ( streamIndex ).getStreamIndex ();
105+ _streams[ subtitleStreamIndex ] = &_subtitleStreams.at (streamIndex);
106+ }
95107
96108for (size_t streamIndex =0 ; streamIndex < _attachementStreams.size (); ++ streamIndex )
97- _streams[ _attachementStreams.at (streamIndex).getStreamIndex () ] = &_attachementStreams.at (streamIndex);
109+ {
110+ const size_t attachementStreamIndex = _attachementStreams.at ( streamIndex ).getStreamIndex ();
111+ _streams[ attachementStreamIndex ] = &_attachementStreams.at (streamIndex);
112+ }
98113
99114for (size_t streamIndex =0 ; streamIndex < _unknownStreams.size (); ++ streamIndex )
100- _streams[ _unknownStreams.at (streamIndex).getStreamIndex () ] = &_unknownStreams.at (streamIndex);
115+ {
116+ const size_t unknownStreamIndex = _unknownStreams.at ( streamIndex ).getStreamIndex ();
117+ _streams[ unknownStreamIndex ] = &_unknownStreams.at (streamIndex);
118+ }
101119
102120// if the analysis level has decoded some streams parts, return at the beginning
103121if ( level > eAnalyseLevelHeader )
