* commit '7c57a582a03fb473091a88737ab92b9f2a5bb87a': jpeg2000dec: don't use deprecated PIX_FMT values
Unified · Split
| @@ -1067,7 +1067,7 @@ static int jpeg2000_decode_tile(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile, · 1066 unmodified lines | ||
| 1067 | 1067 | if (tile->codsty[0].mct) |
| 1068 | 1068 | mct_decode(s, tile); |
| 1069 | 1069 | |
| 1070 | − if (s->avctx->pix_fmt == PIX_FMT_BGRA) // RGBA -> BGRA | |
| 1070 | + if (s->avctx->pix_fmt == AV_PIX_FMT_BGRA) // RGBA -> BGRA | |
| 1071 | 1071 | FFSWAP(float *, tile->comp[0].data, tile->comp[2].data); |
| 1072 | 1072 | |
| 1073 | 1073 | if (s->precision <= 8) { |
| @@ -1351,8 +1351,8 @@ AVCodec ff_jpeg2000_decoder = { · 277 unmodified lines | ||
| 1351 | 1351 | .init_static_data = jpeg2000_init_static_data, |
| 1352 | 1352 | .decode = jpeg2000_decode_frame, |
| 1353 | 1353 | .priv_class = &class, |
| 1354 | − .pix_fmts = (enum PixelFormat[]) { AV_PIX_FMT_XYZ12, | |
| 1355 | − AV_PIX_FMT_GRAY8, | |
| 1356 | − -1 }, | |
| 1354 | + .pix_fmts = (enum AVPixelFormat[]) { AV_PIX_FMT_XYZ12, | |
| 1355 | + AV_PIX_FMT_GRAY8, | |
| 1356 | + -1 }, | |
| 1357 | 1357 | .profiles = NULL_IF_CONFIG_SMALL(profiles) |
| 1358 | 1358 | }; |