[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Dec 23 13:04:02 2013 +0100| [5a1bfa7ed72dad746203d9f68fbe5773ddd9546e] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lavu: fix typo in documentation.

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

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