Michael Niedermayer 1d8e97c79c Merge commit '8f45bd1433a1d8534d7b3997219c4ca31a669042' ...

* commit '8f45bd1433a1d8534d7b3997219c4ca31a669042':
  libopenjpeg: Support rgba64 encoding

Conflicts:
	libavcodec/libopenjpegenc.c

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

2014-03-19 01:32:05 +01:00

24 KiB

Raw Blame History

View Raw