[FFmpeg-cvslog] Merge commit 'db2d65ce1ed13ea9a530b1934963a16c3e8fa460'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Mar 12 21:15:18 2013 +0100| [c51fcdf0f62e3be181fa9a10748c819eea1aaf9e] | committer: Michael Niedermayer

Merge commit 'db2d65ce1ed13ea9a530b1934963a16c3e8fa460'

* commit 'db2d65ce1ed13ea9a530b1934963a16c3e8fa460':
  avconv: fix a typo
  FATE: replace -vb with -b:v

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

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