Changeset f9cd3172 in ffmpeg

Timestamp:

Jun 17, 2014, 6:42:10 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

f31fd067

Parents:

a50c6f99 (diff), fe4d5fe (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 'fe4d5fe9361162f9033ff1bd84bfc1b2091ba785'

• commit 'fe4d5fe9361162f9033ff1bd84bfc1b2091ba785': jpeg2000: Mark static data init functions as av_cold

Conflicts:

libavcodec/jpeg2000.c
libavcodec/jpeg2000dec.c

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

(No files)