diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-15 10:38:55 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-15 10:39:00 +0200 |
| commit | 75835abe910f686cc8dda1fc1ac147f412ecdeda (patch) | |
| tree | e41a919001633fe4df625ce8f99412499144e8c7 | |
| parent | 5692ad00f4881891c67a92bbf2ccc0c601fa3705 (diff) | |
| parent | 7c57a582a03fb473091a88737ab92b9f2a5bb87a (diff) | |
| download | ffmpeg-75835abe910f686cc8dda1fc1ac147f412ecdeda.tar.gz | |
Merge commit '7c57a582a03fb473091a88737ab92b9f2a5bb87a'
* commit '7c57a582a03fb473091a88737ab92b9f2a5bb87a':
jpeg2000dec: don't use deprecated PIX_FMT values
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -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 dd5a9547eb..f7e6b6e8ab 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -1067,7 +1067,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) { @@ -1351,8 +1351,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) }; |