[FFmpeg-cvslog] jpeg2000dec: don't use deprecated PIX_FMT values

[Anton Khirnov]

ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Sun May 12 15:38:17 2013 +0200| [7c57a582a03fb473091a88737ab92b9f2a5bb87a] | committer: Anton Khirnov

jpeg2000dec: don't use deprecated PIX_FMT values

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7c57a582a03fb473091a88737ab92b9f2a5bb87a
---

 libavcodec/jpeg2000dec.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c
index f8a89b1..8c49ea9 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)
 };