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

[ffmpeg] / libavcodec / sunrastenc.c

diff --git a/libavcodec/sunrastenc.c b/libavcodec/sunrastenc.c
index 1ed1d6eddbb6e3639018d3c3b658aec50c37617f..e1b52112d4036b356eb37b29b925bba5c5d81e9c 100644 (file)
--- a/libavcodec/sunrastenc.c
+++ b/libavcodec/sunrastenc.c
@@ -161,16 +161,16 @@ static av_cold int sunrast_encode_init(AVCodecContext *avctx)
     s->maplength                  = 0;
 
     switch (avctx->pix_fmt) {
-    case PIX_FMT_MONOWHITE:
+    case AV_PIX_FMT_MONOWHITE:
         s->depth = 1;
         break;
-    case PIX_FMT_PAL8 :
+    case AV_PIX_FMT_PAL8 :
         s->maptype   = RMT_EQUAL_RGB;
         s->maplength = 3 * 256;
-    case PIX_FMT_GRAY8:
+    case AV_PIX_FMT_GRAY8:
         s->depth = 8;
         break;
-    case PIX_FMT_BGR24:
+    case AV_PIX_FMT_BGR24:
         s->depth = 24;
         break;
     default:
@@ -215,15 +215,15 @@ static const AVCodecDefault sunrast_defaults[] = {
 AVCodec ff_sunrast_encoder = {
     .name           = "sunrast",
     .type           = AVMEDIA_TYPE_VIDEO,
-    .id             = CODEC_ID_SUNRAST,
+    .id             = AV_CODEC_ID_SUNRAST,
     .priv_data_size = sizeof(SUNRASTContext),
     .init           = sunrast_encode_init,
     .encode2        = sunrast_encode_frame,
     .defaults       = sunrast_defaults,
-    .pix_fmts       = (const enum PixelFormat[]){ PIX_FMT_BGR24,
-                                                  PIX_FMT_PAL8,
-                                                  PIX_FMT_GRAY8,
-                                                  PIX_FMT_MONOWHITE,
-                                                  PIX_FMT_NONE },
+    .pix_fmts       = (const enum AVPixelFormat[]){ AV_PIX_FMT_BGR24,
+                                                  AV_PIX_FMT_PAL8,
+                                                  AV_PIX_FMT_GRAY8,
+                                                  AV_PIX_FMT_MONOWHITE,
+                                                  AV_PIX_FMT_NONE },
     .long_name      = NULL_IF_CONFIG_SMALL("Sun Rasterfile image"),
 };