diff options
| author | Anton Khirnov <anton@khirnov.net> | 2013-05-12 15:38:17 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2013-05-15 07:46:39 +0200 |
| commit | 7c57a582a03fb473091a88737ab92b9f2a5bb87a (patch) | |
| tree | a71d6b8a31ac76a58b5a26a39e8ea7596b5322bc | |
| parent | ffba2053edfc177d217bf4a95edf51cd0fc40753 (diff) | |
| download | ffmpeg-7c57a582a03fb473091a88737ab92b9f2a5bb87a.tar.gz | |
jpeg2000dec: don't use deprecated PIX_FMT values
| -rw-r--r-- | libavcodec/jpeg2000dec.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index f8a89b1e44..8c49ea9307 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -1066,7 +1066,7 @@ static int jpeg2000_decode_tile(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile, if (tile->codsty[0].mct) 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); if (s->precision <= 8) { @@ -1346,8 +1346,8 @@ AVCodec ff_jpeg2000_decoder = { .init_static_data = jpeg2000_init_static_data, .decode = jpeg2000_decode_frame, .priv_class = &class, - .pix_fmts = (enum PixelFormat[]) { AV_PIX_FMT_XYZ12, - AV_PIX_FMT_GRAY8, - -1 }, + .pix_fmts = (enum AVPixelFormat[]) { AV_PIX_FMT_XYZ12, + AV_PIX_FMT_GRAY8, + -1 }, .profiles = NULL_IF_CONFIG_SMALL(profiles) }; |