Changeset a6ba5184 in ffmpeg

Timestamp:
May 18, 2014, 7:03:54 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
c01bcce4
Parents:
6eefc578 (diff), 968a62a9 (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.
Message:

Merge commit '968a62a9d9e3a785ce1f79b80facfe09c6c14544'

Conflicts:

doc/APIchanges

Not merged, as there was no such branch in ffmpeg

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

(No files)

Note: See TracChangeset for help on using the changeset viewer.