Merge commit '36e3b1f2fd262028834a9d7b1eb533c1218ee6c2'
[ffmpeg.git] / libavcodec / jpeg2000dwt.h
2013-05-28 Michael Niedermayerjpeg2000dwt: add float based 9/7 dwt
2013-05-27 Michael Niedermayerj2k/jpeg2000: merge j2k & jpeg2000 dwts, drop j2k dwt
2013-04-22 Michael NiedermayerMerge remote-tracking branch 'qatar/master'
2013-04-22 Nicolas BertrandJPEG 2000 decoder for DCinema