Michael Niedermayer 43cce41267 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>

2012-10-12 14:15:33 +02:00

3.5 KiB

Raw Blame History

View Raw