Merge commit 'c302d034ba2690a935df8bf7e4f5d44ed86e8d5c'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 17 Nov 2014 22:09:22 +0000 (23:09 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 17 Nov 2014 22:09:22 +0000 (23:09 +0100)
commite60c025e7357fe45efc73c85310626a9e329d0d5
treeb5eb7502f1b119d3058ef7b9cc946225680d28d7
parent4dc305d784ea01efd30871e9aa6625eff66e9e87
parentc302d034ba2690a935df8bf7e4f5d44ed86e8d5c
Merge commit 'c302d034ba2690a935df8bf7e4f5d44ed86e8d5c'

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

Conflicts:
libavformat/Makefile

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