diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-09-05 12:14:42 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-09-05 12:14:42 +0200 |
| commit | 0940066b803769f041a7ac83cf0df7c23ab033cc (patch) | |
| tree | 31bcb1302be6877a15a777182785b1fd6c5af708 /libavcodec/assenc.c | |
| parent | ef16d1260617cb942b495e322a9668c4b93265e0 (diff) | |
| parent | b21e989a3c076d94cfdde0303724db841dd60cad (diff) | |
| download | ffmpeg-0940066b803769f041a7ac83cf0df7c23ab033cc.tar.gz | |
Merge commit 'b21e989a3c076d94cfdde0303724db841dd60cad'
* commit 'b21e989a3c076d94cfdde0303724db841dd60cad':
ismindex: produce .ismf file
Conflicts:
tools/ismindex.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/assenc.c')
0 files changed, 0 insertions, 0 deletions