[FFmpeg-cvslog] Merge commit 'fe4d5fe9361162f9033ff1bd84bfc1b2091ba785'
Michael Niedermayer
git at videolan.org
Tue Jun 17 21:36:49 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jun 17 20:42:10 2014 +0200| [f9cd317223cb2c7be41c1c0ae2fdc31976247547] | committer: Michael Niedermayer
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 at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f9cd317223cb2c7be41c1c0ae2fdc31976247547
---
More information about the ffmpeg-cvslog
mailing list