[vlc-commits] avcodec: use AV_PIX_FMT_PAL8 iso PIX_FMT_PAL8

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Mon Aug 31 07:15:29 2015 +0200| [5707f03f17980d294cda103892d80d76458dae05] | committer: Jean-Baptiste Kempf

avcodec: use AV_PIX_FMT_PAL8 iso PIX_FMT_PAL8

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=5707f03f17980d294cda103892d80d76458dae05
---

 modules/codec/avcodec/chroma.c |    2 +-
 modules/codec/avcodec/video.c  |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/codec/avcodec/chroma.c b/modules/codec/avcodec/chroma.c
index efd3153..558ae42 100644
--- a/modules/codec/avcodec/chroma.c
+++ b/modules/codec/avcodec/chroma.c
@@ -132,7 +132,7 @@ static const struct
     {VLC_CODEC_GREY, PIX_FMT_GRAY8, 0, 0, 0},
 
      /* Paletized RGB */
-    {VLC_CODEC_RGBP, PIX_FMT_PAL8, 0, 0, 0},
+    {VLC_CODEC_RGBP, AV_PIX_FMT_PAL8, 0, 0, 0},
 
     {VLC_CODEC_GBR_PLANAR, AV_PIX_FMT_GBRP, 0, 0, 0 },
     {VLC_CODEC_GBR_PLANAR_9L, AV_PIX_FMT_GBRP9LE, 0, 0, 0 },
diff --git a/modules/codec/avcodec/video.c b/modules/codec/avcodec/video.c
index 83515ea..f8cb1f0 100644
--- a/modules/codec/avcodec/video.c
+++ b/modules/codec/avcodec/video.c
@@ -244,7 +244,7 @@ static void lavc_CopyPicture(decoder_t *dec, picture_t *pic, AVFrame *frame)
         }
     }
 
-    if (unlikely(sys->p_context->pix_fmt == PIX_FMT_PAL8))
+    if (unlikely(sys->p_context->pix_fmt == AV_PIX_FMT_PAL8))
     {
         if (pic->format.p_palette == NULL)
             pic->format.p_palette = calloc(1, sizeof (video_palette_t));
@@ -980,7 +980,7 @@ static int lavc_dr_GetFrame(struct AVCodecContext *ctx, AVFrame *frame,
     decoder_t *dec = (decoder_t *)ctx->opaque;
     decoder_sys_t *sys = dec->p_sys;
 
-    if (ctx->pix_fmt == PIX_FMT_PAL8)
+    if (ctx->pix_fmt == AV_PIX_FMT_PAL8)
         goto error;
 
     int width = frame->width;