jpeg2000dec: don't use deprecated PIX_FMT values

pull/18/head
Anton Khirnov 12 years ago
parent ffba2053ed
commit 7c57a582a0
  1. 8
      libavcodec/jpeg2000dec.c

@ -1066,7 +1066,7 @@ static int jpeg2000_decode_tile(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile,
if (tile->codsty[0].mct) if (tile->codsty[0].mct)
mct_decode(s, tile); mct_decode(s, tile);
if (s->avctx->pix_fmt == PIX_FMT_BGRA) // RGBA -> BGRA if (s->avctx->pix_fmt == AV_PIX_FMT_BGRA) // RGBA -> BGRA
FFSWAP(float *, tile->comp[0].data, tile->comp[2].data); FFSWAP(float *, tile->comp[0].data, tile->comp[2].data);
if (s->precision <= 8) { if (s->precision <= 8) {
@ -1346,8 +1346,8 @@ AVCodec ff_jpeg2000_decoder = {
.init_static_data = jpeg2000_init_static_data, .init_static_data = jpeg2000_init_static_data,
.decode = jpeg2000_decode_frame, .decode = jpeg2000_decode_frame,
.priv_class = &class, .priv_class = &class,
.pix_fmts = (enum PixelFormat[]) { AV_PIX_FMT_XYZ12, .pix_fmts = (enum AVPixelFormat[]) { AV_PIX_FMT_XYZ12,
AV_PIX_FMT_GRAY8, AV_PIX_FMT_GRAY8,
-1 }, -1 },
.profiles = NULL_IF_CONFIG_SMALL(profiles) .profiles = NULL_IF_CONFIG_SMALL(profiles)
}; };

Loading…
Cancel
Save