1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-04 06:08:26 +02:00
FFmpeg/libavcodec
Michael Niedermayer f9cd317223 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>
2014-06-17 20:42:10 +02:00
..
2014-06-17 13:23:36 +02:00
2014-06-15 12:11:46 +02:00
2014-06-15 12:11:46 +02:00
2014-06-16 04:04:13 +02:00
2014-06-09 05:47:49 +02:00
2014-06-16 13:28:52 +02:00
2014-06-16 13:28:52 +02:00
2014-06-16 13:28:52 +02:00
2014-06-17 13:23:36 +02:00
2014-06-15 23:24:11 +02:00
2014-06-17 13:23:36 +02:00
2014-06-17 13:23:36 +02:00
2014-06-16 04:04:13 +02:00
2014-06-07 17:44:23 +02:00
2014-06-07 17:44:14 +02:00
2014-06-07 17:44:14 +02:00
2014-06-16 04:04:13 +02:00
2014-06-08 15:26:18 +02:00
2014-06-13 04:26:19 +02:00