Merge commit '8fc83fb081963001e1197c6fdd59fd2af415078a'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 20 Aug 2012 14:44:05 +0000 (16:44 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 20 Aug 2012 14:47:12 +0000 (16:47 +0200)
commitc5af0680848a62c482c0fd142f8d6646cec46212
tree11e3b4e6d9c0b8863ab92c5a8e5600c5199cf459
parent93e75c78ddae7ac1fd7211b9269b5cdcfd30c665
parent8fc83fb081963001e1197c6fdd59fd2af415078a
Merge commit '8fc83fb081963001e1197c6fdd59fd2af415078a'

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

Conflicts:
ffmpeg_opt.c

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