[FFmpeg-cvslog] Merge commit '8f45bd1433a1d8534d7b3997219c4ca31a669042'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Mar 19 01:29:44 2014 +0100| [1d8e97c79c2dc1100822f7cacc71295f7fc7fb0a] | committer: Michael Niedermayer

Merge commit '8f45bd1433a1d8534d7b3997219c4ca31a669042'

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

Conflicts:
	libavcodec/libopenjpegenc.c

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

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