[FFmpeg-cvslog] Merge commit '8fc83fb081963001e1197c6fdd59fd2af415078a'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Aug 20 16:44:05 2012 +0200| [c5af0680848a62c482c0fd142f8d6646cec46212] | committer: Michael Niedermayer

Merge commit '8fc83fb081963001e1197c6fdd59fd2af415078a'

* commit '8fc83fb081963001e1197c6fdd59fd2af415078a':
  avconv: reformat the options table.

Conflicts:
	ffmpeg_opt.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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