aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2015-07-05 23:49:17 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-07-06 00:06:54 +0200
commit97fa0f37fee3096acb7ee7de83ac5d1a8b1c777a (patch)
tree41db78d9380f3c9d77aa5a304901191bd7339325
parente43ea1cbb213def50083812936c6a3c8e28a7789 (diff)
downloadffmpeg-97fa0f37fee3096acb7ee7de83ac5d1a8b1c777a.tar.gz
lavc/j2kenc: Enable yuv42x and yuv41x encoding.
Fixes ticket #535. Fixes ticket #4524.
-rw-r--r--libavcodec/j2kenc.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/libavcodec/j2kenc.c b/libavcodec/j2kenc.c
index f28cd56adb..dbe0783b36 100644
--- a/libavcodec/j2kenc.c
+++ b/libavcodec/j2kenc.c
@@ -1163,9 +1163,8 @@ AVCodec ff_jpeg2000_encoder = {
.capabilities = CODEC_CAP_EXPERIMENTAL,
.pix_fmts = (const enum AVPixelFormat[]) {
AV_PIX_FMT_RGB24, AV_PIX_FMT_YUV444P, AV_PIX_FMT_GRAY8,
-/* AV_PIX_FMT_YUV420P,
- AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV444P,
- AV_PIX_FMT_YUV410P, AV_PIX_FMT_YUV411P,*/
+ AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV422P,
+ AV_PIX_FMT_YUV410P, AV_PIX_FMT_YUV411P,
AV_PIX_FMT_NONE
},
.priv_class = &j2k_class,