* commit 'c302d034ba2690a935df8bf7e4f5d44ed86e8d5c': tools: Add a sidxindex tool Conflicts: libavformat/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit 'c302d034ba2690a935df8bf7e4f5d44ed86e8d5c': tools: Add a sidxindex tool Conflicts: libavformat/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>