Changeset 9c77e573 in ffmpeg

Timestamp:

Mar 30, 2014, 7:20:58 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

6d9bdd9d

Parents:

f22d9b1e (diff), 3a5a9654 (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.

git-author:

Michael Niedermayer <michaelni@gmx.at> (03/30/14 19:19:40)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (03/30/14 19:20:58)

Message:

Merge remote-tracking branch 'qatar/master'

• qatar/master: avconv: make the ASCII flow charts narrower to fit onto TTY

Conflicts:

doc/ffmpeg.texi

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

(No files)