jpeg2000/j2k: merge j2k/jpeg2000.c/h
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 30 May 2013 12:40:58 +0000 (14:40 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 30 May 2013 12:57:58 +0000 (14:57 +0200)
commit62d00aa22f28532edc192bd9bf92e815ff78304e
treef09d4de8f715642c7fe2d7f27830bd89618fa1af
parentc2ac389bba2481d18b59055c0a929e57b241c055
jpeg2000/j2k: merge j2k/jpeg2000.c/h

Now only j2kdec / jpeg2000dec.c remain

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/Makefile
libavcodec/j2k.c [deleted file]
libavcodec/j2k.h [deleted file]
libavcodec/j2kdec.c
libavcodec/j2kenc.c
libavcodec/jpeg2000.c
libavcodec/jpeg2000.h