Merge commit 'f4634ae8a83d13a1abf3baac8956a3111aa09ed2'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 28 Aug 2013 10:03:00 +0000 (12:03 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 28 Aug 2013 10:03:06 +0000 (12:03 +0200)
commit946902e5b9c2574969ac239b2dfb4d88e069fa29
tree148236dbf6b477452c0360f281cca90e963c5b58
parenta13af77f49d79e8994d22e598e4ca82a2f5d09d4
parentf4634ae8a83d13a1abf3baac8956a3111aa09ed2
Merge commit 'f4634ae8a83d13a1abf3baac8956a3111aa09ed2'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/flvdec.c