Changeset 78b54796 in ffmpeg

Timestamp:
Jun 30, 2013, 9:35:52 AM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
0b40c505
Parents:
c93a4247 (diff), 502ab21a (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> (06/30/13 09:30:07)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (06/30/13 09:35:52)
Message:

Merge commit '502ab21af0ca68f76d6112722c46d2f35c004053'

The versions are bumped due to changes in lls.h which is used across
libraries affecting intra library ABI
(This version bump also covers changes to lls.h in the immedeatly previous

commits)

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

(No files)

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