]> git.sesse.net Git - ffmpeg/commit
Merge commit '8f45bd1433a1d8534d7b3997219c4ca31a669042'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 19 Mar 2014 00:29:44 +0000 (01:29 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 19 Mar 2014 00:32:05 +0000 (01:32 +0100)
commit1d8e97c79c2dc1100822f7cacc71295f7fc7fb0a
tree2bf331b1963b0d90338efc9097e0a243cbc5e60d
parent543a46e0d1f32ab162f2dc9fd0233d9831b6f805
parent8f45bd1433a1d8534d7b3997219c4ca31a669042
Merge commit '8f45bd1433a1d8534d7b3997219c4ca31a669042'

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

Conflicts:
libavcodec/libopenjpegenc.c

See: 36397ea1c7e27ab850149cc61394c2baa26dd532
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/libopenjpegenc.c