diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-17 23:09:22 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-17 23:09:22 +0100 |
| commit | e60c025e7357fe45efc73c85310626a9e329d0d5 (patch) | |
| tree | b5eb7502f1b119d3058ef7b9cc946225680d28d7 /libavresample/options.c | |
| parent | 4dc305d784ea01efd30871e9aa6625eff66e9e87 (diff) | |
| parent | c302d034ba2690a935df8bf7e4f5d44ed86e8d5c (diff) | |
| download | ffmpeg-e60c025e7357fe45efc73c85310626a9e329d0d5.tar.gz | |
Merge commit 'c302d034ba2690a935df8bf7e4f5d44ed86e8d5c'
* commit 'c302d034ba2690a935df8bf7e4f5d44ed86e8d5c':
tools: Add a sidxindex tool
Conflicts:
libavformat/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavresample/options.c')
0 files changed, 0 insertions, 0 deletions