Merge commit 'f661006f235fa58bc756610cdc76c662ac0fab5f' into release/0.10
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 11 Mar 2015 20:54:41 +0000 (21:54 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 11 Mar 2015 20:54:41 +0000 (21:54 +0100)
commit9ba0719244bf626e817e56c9aad0272ca55b0484
tree8cb8867550617190c4dfbc1bb8daec20051ad608
parent8e37603ac9612448b9dbe64a9988e489d961caee
parentf661006f235fa58bc756610cdc76c662ac0fab5f
Merge commit 'f661006f235fa58bc756610cdc76c662ac0fab5f' into release/0.10

* commit 'f661006f235fa58bc756610cdc76c662ac0fab5f':
  doc: Fix syntax and logical errors in avconv stream combination example

Conflicts:
doc/avconv.texi

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