Merge commit '9920a8a83f578821e00212da6b79c8997a725fa8' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 21 Dec 2014 03:04:48 +0000 (04:04 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 21 Dec 2014 03:04:48 +0000 (04:04 +0100)
commit2b8effcda3f98e3df48bed305ee416bbe06c7230
treedbd5cafcfa7d7255284c0cd9967250601e5ab8de
parentf3c8a8b087d08019604fd641970b49144cc3dfa2
parent9920a8a83f578821e00212da6b79c8997a725fa8
Merge commit '9920a8a83f578821e00212da6b79c8997a725fa8' into release/1.1

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

Conflicts:
doc/ffmpeg.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/ffmpeg.texi