Changeset 58fdc6db in ffmpeg

Timestamp:

Feb 10, 2014, 12:37:37 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

6fd7ea44

Parents:

6fb8684 (diff), ad7f2b69 (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> (02/10/14 12:32:18)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (02/10/14 12:37:37)

Message:

Merge commit 'ad7f2b69a546ec65ef6b11e1a0fd58e6bb66bc4b'

• commit 'ad7f2b69a546ec65ef6b11e1a0fd58e6bb66bc4b': lavf: rewrite the av_interleaved_write_frame() doxy

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

(No files)