j2k/jpeg2000dec: merge
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 31 May 2013 00:12:22 +0000 (02:12 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 31 May 2013 01:10:08 +0000 (03:10 +0200)
commit9d56ccf5af52cb6d937c85c6c205cd38fa9d54ba
tree90555a38c78062885be162271998559c64fe80ff
parentfd7e1190379db1b2b3eaa31c00dc9c92803faef3
j2k/jpeg2000dec: merge

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
15 files changed:
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/j2kdec.c [deleted file]
libavcodec/j2kenc.c
libavcodec/jpeg2000.c
libavcodec/jpeg2000dec.c
tests/fate/vcodec.mak
tests/ref/vsynth/vsynth1-j2k [deleted file]
tests/ref/vsynth/vsynth1-j2k-97 [deleted file]
tests/ref/vsynth/vsynth1-jpeg2000 [new file with mode: 0644]
tests/ref/vsynth/vsynth1-jpeg2000-97 [new file with mode: 0644]
tests/ref/vsynth/vsynth2-j2k [deleted file]
tests/ref/vsynth/vsynth2-j2k-97 [deleted file]
tests/ref/vsynth/vsynth2-jpeg2000 [new file with mode: 0644]
tests/ref/vsynth/vsynth2-jpeg2000-97 [new file with mode: 0644]