mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-09-12 01:03:16 +00:00
Merge commit '8f45bd1433a1d8534d7b3997219c4ca31a669042'
* commit '8f45bd1433a1d8534d7b3997219c4ca31a669042':
libopenjpeg: Support rgba64 encoding
Conflicts:
libavcodec/libopenjpegenc.c
See: 36397ea1c7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
1d8e97c79c
1 changed files with 2 additions and 2 deletions
|
@ -647,8 +647,8 @@ AVCodec ff_libopenjpeg_encoder = {
|
|||
.close = libopenjpeg_encode_close,
|
||||
.capabilities = 0,
|
||||
.pix_fmts = (const enum AVPixelFormat[]) {
|
||||
AV_PIX_FMT_RGB24, AV_PIX_FMT_RGBA, AV_PIX_FMT_RGB48, AV_PIX_FMT_RGBA64,
|
||||
AV_PIX_FMT_GBR24P,
|
||||
AV_PIX_FMT_RGB24, AV_PIX_FMT_RGBA, AV_PIX_FMT_RGB48,
|
||||
AV_PIX_FMT_RGBA64, AV_PIX_FMT_GBR24P,
|
||||
AV_PIX_FMT_GBRP9, AV_PIX_FMT_GBRP10, AV_PIX_FMT_GBRP12, AV_PIX_FMT_GBRP14, AV_PIX_FMT_GBRP16,
|
||||
AV_PIX_FMT_GRAY8, AV_PIX_FMT_GRAY8A, AV_PIX_FMT_GRAY16,
|
||||
AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUVA420P,
|
||||
|
|
Loading…
Reference in a new issue