Michael Niedermayer 99091ff217 Merge commit '205a4502d3da9de2db75d2c965c9d065574e9266'
* commit '205a4502d3da9de2db75d2c965c9d065574e9266':
  doc: Clarify the avconv section about -re

Conflicts:
	doc/ffmpeg.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-11 11:49:47 +02:00
..
2012-10-08 11:22:42 +02:00
2013-08-10 10:07:30 +02:00
2013-07-10 03:14:23 +02:00
2013-07-28 16:39:06 +02:00
2013-01-06 16:30:02 +01:00
2013-08-10 10:07:30 +02:00
2012-12-21 00:18:34 +01:00
2013-07-10 02:15:43 +02:00
2013-07-22 03:37:55 +02:00
2013-01-06 16:30:02 +01:00
2013-02-14 23:45:48 +01:00
2012-12-21 00:18:34 +01:00