Merge commit '205a4502d3da9de2db75d2c965c9d065574e9266'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 11 Aug 2013 09:49:47 +0000 (11:49 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 11 Aug 2013 09:49:47 +0000 (11:49 +0200)
commit99091ff217440daa33fddcf66170e1a6d630c3a4
tree8146302a4c2f83b05eb2ecc2a99ec131360e2feb
parent5993b962691ae29b6563785d26ef2a19ffa97f4c
parent205a4502d3da9de2db75d2c965c9d065574e9266
Merge commit '205a4502d3da9de2db75d2c965c9d065574e9266'

* commit '205a4502d3da9de2db75d2c965c9d065574e9266':
  doc: Clarify the avconv section about -re

Conflicts:
doc/ffmpeg.texi

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