From: Michael Niedermayer <michaelni@gmx.at>
Date: Fri, 5 Sep 2014 10:14:42 +0000 (+0200)
Subject: Merge commit 'b21e989a3c076d94cfdde0303724db841dd60cad'
X-Git-Tag: n2.5-dev~131
X-Git-Url: http://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/0940066b803769f041a7ac83cf0df7c23ab033cc

Merge commit 'b21e989a3c076d94cfdde0303724db841dd60cad'

* commit 'b21e989a3c076d94cfdde0303724db841dd60cad':
  ismindex: produce .ismf file

Conflicts:
	tools/ismindex.c

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

0940066b803769f041a7ac83cf0df7c23ab033cc