[FFmpeg-cvslog] Merge commit '11e05533170485b593974cf90916425a0188e7bd'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Feb  2 21:16:08 2015 +0100| [8f79cd4764f7cdf3c5b5252e39ee0a6725f2eb94] | committer: Michael Niedermayer

Merge commit '11e05533170485b593974cf90916425a0188e7bd'

* commit '11e05533170485b593974cf90916425a0188e7bd':
  Ignore generated file tools/sidxindex.

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

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