lavc: move SANE_NB_CHANNELS to internal.h and use it in the PCM decoders

[ffmpeg] / libavcodec / pictordec.c

diff --git a/libavcodec/pictordec.c b/libavcodec/pictordec.c
index 53a14c90e20fc48e8b6988f5d867aa4c4846a5c8..a0affc98e8cb9b144a6d1d863c7d48fe7cf61d44 100644 (file)
--- a/libavcodec/pictordec.c
+++ b/libavcodec/pictordec.c
@@ -136,7 +136,7 @@ static int decode_frame(AVCodecContext *avctx,
         esize = 0;
     }
 
-    avctx->pix_fmt = PIX_FMT_PAL8;
+    avctx->pix_fmt = AV_PIX_FMT_PAL8;
 
     if (s->width != avctx->width && s->height != avctx->height) {
         if (av_image_check_size(s->width, s->height, 0, avctx) < 0)
@@ -253,7 +253,7 @@ static av_cold int decode_end(AVCodecContext *avctx)
 AVCodec ff_pictor_decoder = {
     .name           = "pictor",
     .type           = AVMEDIA_TYPE_VIDEO,
-    .id             = CODEC_ID_PICTOR,
+    .id             = AV_CODEC_ID_PICTOR,
     .priv_data_size = sizeof(PicContext),
     .close          = decode_end,
     .decode         = decode_frame,