Changeset aebce0b0 in ffmpeg

Timestamp:
Mar 29, 2012, 2:55:58 AM (13 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
ddd89740
Parents:
9aeacc95 (diff), b678dd96 (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/29/12 02:54:57)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (03/29/12 02:55:58)
Message:

Merge git://github.com/mjbshaw/FFmpeg-OpenJPEG-J2K-Encoder

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

(No files)

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