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

Conflicts:
	libavformat/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>