Changeset 13278b97 in ffmpeg

Timestamp:

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

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

206d533

Parents:

8a9878b4 (diff), baeb59d8 (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:08:01)

git-committer:

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

Message:

Merge commit 'baeb59d89beda499688e528c6a269d2b255b66f2'

• commit 'baeb59d89beda499688e528c6a269d2b255b66f2': avconv: rewrite output data size tracking

Conflicts:

ffmpeg.c

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

(No files)