[FFmpeg-cvslog] Merge commit '0a75d1da23b8659ec49391469bb592da12760077'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Oct 12 14:15:33 2012 +0200| [43cce41267a7aa71946911e87b4dfce48183bb25] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=43cce41267a7aa71946911e87b4dfce48183bb25
---