X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fjpeg2000dec.c;h=25653e085a730bd467c6d6a0d91d57e3f2e27ac7;hb=4ecc9a2f31bfafd5438558311f858ad4c7138214;hp=49d41518b473cef84d8707b3e8490d786d0acb2a;hpb=bb619f41bea81e6ee9e208476a92fced4107a853;p=ffmpeg diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index 49d41518b47..25653e085a7 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -467,7 +467,7 @@ static int get_cox(Jpeg2000DecoderContext *s, Jpeg2000CodingStyle *c) } c->transform = bytestream2_get_byteu(&s->g); // DWT transformation type /* set integer 9/7 DWT in case of BITEXACT flag */ - if ((s->avctx->flags & CODEC_FLAG_BITEXACT) && (c->transform == FF_DWT97)) + if ((s->avctx->flags & AV_CODEC_FLAG_BITEXACT) && (c->transform == FF_DWT97)) c->transform = FF_DWT97_INT; else if (c->transform == FF_DWT53) { s->avctx->properties |= FF_CODEC_PROPERTY_LOSSLESS; @@ -2159,7 +2159,7 @@ AVCodec ff_jpeg2000_decoder = { .long_name = NULL_IF_CONFIG_SMALL("JPEG 2000"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_JPEG2000, - .capabilities = CODEC_CAP_FRAME_THREADS | CODEC_CAP_DR1, + .capabilities = AV_CODEC_CAP_FRAME_THREADS | AV_CODEC_CAP_DR1, .priv_data_size = sizeof(Jpeg2000DecoderContext), .init_static_data = jpeg2000_init_static_data, .init = jpeg2000_decode_init,