[FFmpeg-cvslog] Merge commit 'e48d1ea541be4592ebac89875557407ca958b7a9'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Sep  2 11:20:13 2014 +0200| [35469835bb2960f85b6c4acf19632333307937e7] | committer: Michael Niedermayer

Merge commit 'e48d1ea541be4592ebac89875557407ca958b7a9'

* commit 'e48d1ea541be4592ebac89875557407ca958b7a9':
  ismindex: improve diagnostics

Conflicts:
	tools/ismindex.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=35469835bb2960f85b6c4acf19632333307937e7
---