x/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-07-04 02:23:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
56,851 Commits 40 Branches 429 Tags
2ece7d94bc35ba0ee2b650caec25853b9fcc2eb7
Commit Graph
3 Commits
Author SHA1 Message Date
Michael Niedermayer e2e9bee2da Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  avcodec: Bump minor for JPEG 2000 decoder
  JPEG 2000 decoder for DCinema

The mqc code is merged, the rest is added independent of
the existing jpeg2000 decoder and encoder.

Conflicts:
	Changelog
	doc/general.texi
	libavcodec/Makefile
	libavcodec/allcodecs.c
	libavcodec/mqc.c
	libavcodec/mqc.h
	libavcodec/mqcdec.c
	libavcodec/version.h
	tests/fate/video.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-22 20:00:54 +02:00
Nicolas BertrandandDiego Biurrun c81a706381 JPEG 2000 decoder for DCinema 
Based on the 2007 GSoC project from Kamil Nowosad <k.nowosad@students.mimuw.edu.pl>
Updated to current programming standards, style and many more small
fixes by Diego Biurrun <diego@biurrun.de>.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-04-22 15:38:29 +02:00
Kamil NowosadandMichael Niedermayer 83654c7b1b Add Kamil Nowosads j2k code. 
This needs work but it should not rot in soc svn.
 2011-05-24 01:31:53 +02:00