Changeset 966a57b6 in ffmpeg

Timestamp:

Apr 29, 2015, 1:56:32 AM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

78f50e7e

Parents:

27801500 (diff), c3418201 (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> (04/29/15 01:55:59)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (04/29/15 01:56:32)

Message:

Merge commit 'c3418201307c6b7a2b3e3be10f33ab4a20a32c3b'

• commit 'c3418201307c6b7a2b3e3be10f33ab4a20a32c3b': jpeglsenc: Mark codec as init-thread-safe and init-cleanup

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

(No files)