diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-19 01:29:44 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-19 01:32:05 +0100 |
| commit | 1d8e97c79c2dc1100822f7cacc71295f7fc7fb0a (patch) | |
| tree | 2bf331b1963b0d90338efc9097e0a243cbc5e60d | |
| parent | 543a46e0d1f32ab162f2dc9fd0233d9831b6f805 (diff) | |
| parent | 8f45bd1433a1d8534d7b3997219c4ca31a669042 (diff) | |
| download | ffmpeg-1d8e97c79c2dc1100822f7cacc71295f7fc7fb0a.tar.gz | |
Merge commit '8f45bd1433a1d8534d7b3997219c4ca31a669042'
* commit '8f45bd1433a1d8534d7b3997219c4ca31a669042':
libopenjpeg: Support rgba64 encoding
Conflicts:
libavcodec/libopenjpegenc.c
See: 36397ea1c7e27ab850149cc61394c2baa26dd532
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/libopenjpegenc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/libopenjpegenc.c b/libavcodec/libopenjpegenc.c index dd53840055..ac77c7d196 100644 --- a/libavcodec/libopenjpegenc.c +++ b/libavcodec/libopenjpegenc.c @@ -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, |