diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-12 14:15:33 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-12 14:15:33 +0200 |
| commit | 43cce41267a7aa71946911e87b4dfce48183bb25 (patch) | |
| tree | 65005ccffc4a671a46163fc3e47b5f1c40b9e12d /libswscale | |
| parent | caa7e24eb1d47a0dfeb9783909bce7df6d3f5482 (diff) | |
| parent | 0a75d1da23b8659ec49391469bb592da12760077 (diff) | |
| download | ffmpeg-43cce41267a7aa71946911e87b4dfce48183bb25.tar.gz | |
Merge commit '0a75d1da23b8659ec49391469bb592da12760077'
* commit '0a75d1da23b8659ec49391469bb592da12760077':
options_table: refs option is not snow-only
random_seed: Support using CryptGenRandom on windows
doc: update the faq entry about custom I/O
Conflicts:
doc/faq.texi
libavcodec/options_table.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale')
0 files changed, 0 insertions, 0 deletions