Changeset c8a0a2e in ffmpeg

Timestamp:

Nov 21, 2013, 6:06:31 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

c0caf7e8

Parents:

a486dec4 (diff), d28fc7b (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> (11/21/13 18:03:59)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (11/21/13 18:06:31)

Message:

Merge commit 'd28fc7b29a728bd2f88c10121abbd0442c341746'

• commit 'd28fc7b29a728bd2f88c10121abbd0442c341746': avconv_filter: add new line after error message

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

(No files)