Changeset 99091ff2 in ffmpeg

Timestamp:

Aug 11, 2013, 9:49:47 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

15c92f8

Parents:

5993b96 (diff), 205a4502 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge commit '205a4502d3da9de2db75d2c965c9d065574e9266'

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

Conflicts:

doc/ffmpeg.texi

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

(No files)