Merge commit '82f8eb5f773d87e3d9c0066ef19b501a461ddfae'

Browse Source

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

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

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

...

This commit is contained in:

Michael Niedermayer

2014-10-08 11:39:28 +02:00

parent f3296b9454 82f8eb5f77

commit 36e4b750a7

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available