virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

jpeg2000dec: don't use deprecated PIX_FMT values

Browse Source
This commit is contained in:
Anton Khirnov
2013-05-12 15:38:17 +02:00
parent ffba2053ed
commit 7c57a582a0
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/jpeg2000dec.c
View File

@@ -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 = {
.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)