Merge commit '0a75d1da23b8659ec49391469bb592da12760077'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 12 Oct 2012 12:15:33 +0000 (14:15 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 12 Oct 2012 12:15:33 +0000 (14:15 +0200)
commit43cce41267a7aa71946911e87b4dfce48183bb25
tree65005ccffc4a671a46163fc3e47b5f1c40b9e12d
parentcaa7e24eb1d47a0dfeb9783909bce7df6d3f5482
parent0a75d1da23b8659ec49391469bb592da12760077
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>
configure
doc/faq.texi
libavutil/random_seed.c