[FFmpeg-cvslog] Merge commit '82f8eb5f773d87e3d9c0066ef19b501a461ddfae'

Wed Oct 8 11:45:42 CEST 2014

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Oct  8 11:39:28 2014 +0200| [36e4b750a79b4f9592938bacc973f8983f1e18aa] | committer: Michael Niedermayer

Merge commit '82f8eb5f773d87e3d9c0066ef19b501a461ddfae'

* commit '82f8eb5f773d87e3d9c0066ef19b501a461ddfae':
  jpeg2000: split off inverse MCT as Jpeg2000DSP

Conflicts:
	libavcodec/Makefile
	libavcodec/jpeg2000dec.c
	libavcodec/jpeg2000dsp.c
	libavcodec/jpeg2000dsp.h

See: c9f2ec8a3464718641742a105179f828ccbfb392
Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=36e4b750a79b4f9592938bacc973f8983f1e18aa
---