ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Fri Sep 5
12:14:42 2014 +0200| [0940066b803769f041a7ac83cf0df7c23ab033cc] | committer:
Michael Niedermayer
Merge commit 'b21e989a3c076d94cfdde0303724db841dd60cad'
* commit 'b21e989a3c076d94cfdde0303724db841dd60cad':
ismindex: produce .ismf file
Conflicts:
tools/ismindex.c
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0940066b803769f041a7ac83cf0df7c23ab033cc
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
