[FFmpeg-cvslog] Merge commit 'c302d034ba2690a935df8bf7e4f5d44ed86e8d5c'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Nov 17 23:09:22 2014 +0100| [e60c025e7357fe45efc73c85310626a9e329d0d5] | committer: Michael Niedermayer

Merge commit 'c302d034ba2690a935df8bf7e4f5d44ed86e8d5c'

* commit 'c302d034ba2690a935df8bf7e4f5d44ed86e8d5c':
  tools: Add a sidxindex tool

Conflicts:
	libavformat/Makefile

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

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