[FFmpeg-cvslog] Merge commit 'f4634ae8a83d13a1abf3baac8956a3111aa09ed2'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Aug 28 12:03:00 2013 +0200| [946902e5b9c2574969ac239b2dfb4d88e069fa29] | committer: Michael Niedermayer

Merge commit 'f4634ae8a83d13a1abf3baac8956a3111aa09ed2'

* commit 'f4634ae8a83d13a1abf3baac8956a3111aa09ed2':
  flv: Fix the help string

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

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