Merge commit 'e48d1ea541be4592ebac89875557407ca958b7a9'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 2 Sep 2014 09:20:13 +0000 (11:20 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 2 Sep 2014 09:20:13 +0000 (11:20 +0200)
* commit 'e48d1ea541be4592ebac89875557407ca958b7a9':
  ismindex: improve diagnostics

Conflicts:
tools/ismindex.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
tools/ismindex.c

Simple merge