jpeg2000/j2k: merge non functional changes
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 30 May 2013 15:14:19 +0000 (17:14 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 30 May 2013 16:38:04 +0000 (18:38 +0200)
commit3f714d1ffd96f13354f42487ff5df7411ac47c8b
tree9b4554fd9c9235c884a4e5a64ed8b5e7aca732f1
parent941a8efae2ac166840bc8ec2a1534289b6714957
jpeg2000/j2k: merge non functional changes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/j2kdec.c
libavcodec/jpeg2000dec.c