Skip to content

F
ffmpeg.wasm-core
Commit 7c57a582 authored by Anton Khirnov's avatar Anton Khirnov
Browse files
Options

jpeg2000dec: don't use deprecated PIX_FMT values

parent ffba2053
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
libavcodec/jpeg2000dec.c
View file @ 7c57a582
...@@ -1066,7 +1066,7 @@ static int jpeg2000_decode_tile(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile, ...@@ -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,7 +1346,7 @@ AVCodec ff_jpeg2000_decoder = { ...@@ -1346,7 +1346,7 @@ 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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment