diff options
Diffstat (limited to 'libavcodec/j2kenc.c')
| -rw-r--r-- | libavcodec/j2kenc.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libavcodec/j2kenc.c b/libavcodec/j2kenc.c index 6e4ae16032..0c15fb0bf9 100644 --- a/libavcodec/j2kenc.c +++ b/libavcodec/j2kenc.c @@ -286,7 +286,7 @@ static int put_cod(J2kEncoderContext *s) // SGcod bytestream_put_byte(&s->buf, 0); // progression level bytestream_put_be16(&s->buf, 1); // num of layers - if(s->avctx->pix_fmt == PIX_FMT_YUV444P){ + if(s->avctx->pix_fmt == AV_PIX_FMT_YUV444P){ bytestream_put_byte(&s->buf, 2); // ICT }else{ bytestream_put_byte(&s->buf, 0); // unspecified @@ -1010,9 +1010,9 @@ static av_cold int j2kenc_init(AVCodecContext *avctx) for (i = 0; i < 3; i++) s->cbps[i] = 8; - if (avctx->pix_fmt == PIX_FMT_RGB24){ + if (avctx->pix_fmt == AV_PIX_FMT_RGB24){ s->ncomponents = 3; - } else if (avctx->pix_fmt == PIX_FMT_GRAY8){ + } else if (avctx->pix_fmt == AV_PIX_FMT_GRAY8){ s->ncomponents = 1; } else{ // planar YUV s->planar = 1; @@ -1052,11 +1052,11 @@ AVCodec ff_jpeg2000_encoder = { .close = j2kenc_destroy, .capabilities = CODEC_CAP_EXPERIMENTAL, .long_name = NULL_IF_CONFIG_SMALL("JPEG 2000"), - .pix_fmts = (const enum PixelFormat[]) { - PIX_FMT_RGB24, PIX_FMT_YUV444P, PIX_FMT_GRAY8, -/* PIX_FMT_YUV420P, - PIX_FMT_YUV422P, PIX_FMT_YUV444P, - PIX_FMT_YUV410P, PIX_FMT_YUV411P,*/ - PIX_FMT_NONE + .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_NONE } }; |