Changeset afa442c1 in ffmpeg

Timestamp:

Mar 24, 2014, 3:30:29 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

1046cd60

Parents:

ecb5b9c0 (diff), a220b07b (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/24/14 15:25:31)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (03/24/14 15:30:29)

Message:

Merge commit 'a220b07b0f971f88213aef012aea51af2800be62'

• commit 'a220b07b0f971f88213aef012aea51af2800be62': avconv: split printing the final statistics into a separate function

Conflicts:

ffmpeg.c

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

(No files)