Changeset b2fb65c in ffmpeg

Timestamp:
Jun 11, 2014, 1:10:21 AM (10 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
43d995e
Parents:
b3a647d9 (diff), 641e5723 (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 '641e57230b460bef52c88e61087d97c223910bea'

Conflicts:

tests/fate/audio.mak

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

(No files)

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