[FFmpeg-cvslog] Merge commit '79be2c325c5ee8f7ac9e28399e51986ebe99bb3c'

[Carl Eugen Hoyos]

Michael Niedermayer <git <at> videolan.org> writes:

> ffmpeg | branch: master | Michael Niedermayer | 
> Sat Aug  3 09:22:24 2013 +0200|
> [fa5410f61a75393d8019200ea8ef6a293ab050a1] | 
> committer: Michael Niedermayer
> 
> Merge commit '79be2c325c5ee8f7ac9e28399e51986ebe99bb3c'
> 
> * commit '79be2c325c5ee8f7ac9e28399e51986ebe99bb3c':
>   doc/print_options: Move options headers to a saner place
> 
> Merged-by: Michael Niedermayer <michaelni <at> gmx.at>

I believe this broke building the documentation on static 
msvc.

Carl Eugen