X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fsunrastenc.c;h=af4529815bfa5e7fe6581ff601c4358c9c60e53b;hb=f34521266ec5816eefa4c10db6098cb91e03c695;hp=97b2242a6eb47cbb126b53843b2e8214b44aee1c;hpb=2d62e06ff6a9f3dbd78136c1dc4a315a727c6f00;p=ffmpeg diff --git a/libavcodec/sunrastenc.c b/libavcodec/sunrastenc.c index 97b2242a6eb..af4529815bf 100644 --- a/libavcodec/sunrastenc.c +++ b/libavcodec/sunrastenc.c @@ -140,22 +140,6 @@ static av_cold int sunrast_encode_init(AVCodecContext *avctx) { SUNRASTContext *s = avctx->priv_data; -#if FF_API_CODER_TYPE -FF_DISABLE_DEPRECATION_WARNINGS - switch (avctx->coder_type) { - case FF_CODER_TYPE_RLE: - s->type = RT_BYTE_ENCODED; - break; - case FF_CODER_TYPE_RAW: - s->type = RT_STANDARD; - break; - default: - av_log(avctx, AV_LOG_ERROR, "invalid coder_type\n"); - return AVERROR(EINVAL); - } -FF_ENABLE_DEPRECATION_WARNINGS - if (s->type != RT_BYTE_ENCODED && s->type != RT_STANDARD) -#endif // adjust boolean option to RT equivalent s->type++; @@ -224,13 +208,6 @@ static const AVClass sunrast_class = { .version = LIBAVUTIL_VERSION_INT, }; -#if FF_API_CODER_TYPE -static const AVCodecDefault sunrast_defaults[] = { - { "coder", "rle" }, - { NULL }, -}; -#endif - AVCodec ff_sunrast_encoder = { .name = "sunrast", .long_name = NULL_IF_CONFIG_SMALL("Sun Rasterfile image"), @@ -239,9 +216,6 @@ AVCodec ff_sunrast_encoder = { .priv_data_size = sizeof(SUNRASTContext), .init = sunrast_encode_init, .encode2 = sunrast_encode_frame, -#if FF_API_CODER_TYPE - .defaults = sunrast_defaults, -#endif .priv_class = &sunrast_class, .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_BGR24, AV_PIX_FMT_PAL8,