Merge commit '775a0b04f0cf8102fe322b2ee03fe1a0633dea04'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 10 Sep 2014 23:26:31 +0000 (01:26 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 10 Sep 2014 23:27:38 +0000 (01:27 +0200)
commit5e3da256184e13502b3428f94e180888436d157b
treef7fe7878be400b38b909f9862bd3b0392b62e24c
parent3e56ae67d300f0eed2b9040fcc7c5e3229f0cde1
parent775a0b04f0cf8102fe322b2ee03fe1a0633dea04
Merge commit '775a0b04f0cf8102fe322b2ee03fe1a0633dea04'

* commit '775a0b04f0cf8102fe322b2ee03fe1a0633dea04':
  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