]> git.sesse.net Git - ffmpeg/commitdiff
projects / ffmpeg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ef16d12 b21e989)
Merge commit 'b21e989a3c076d94cfdde0303724db841dd60cad'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 5 Sep 2014 10:14:42 +0000 (12:14 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 5 Sep 2014 10:14:42 +0000 (12:14 +0200)
* commit 'b21e989a3c076d94cfdde0303724db841dd60cad':
  ismindex: produce .ismf file

Conflicts:
tools/ismindex.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
tools/ismindex.c patch | diff1 | diff2 | blob | history

diff --cc tools/ismindex.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.