avfilter: remove FF_API_SWS_PARAM_OPTION

James Almer committed 3 years ago

Commit a9e77b41 parent 6d6ae352 files · +0 −12Browse files

Unified · Split

2 files

     int               w, h;
     enum AVPixelFormat  pix_fmt;
     AVRational        pixel_aspect;
-#if FF_API_SWS_PARAM_OPTION
-    char              *sws_param;
-#endif
     AVBufferRef *hw_frames_ctx;
            c->time_base.num, c->time_base.den, c->frame_rate.num, c->frame_rate.den,
            c->pixel_aspect.num, c->pixel_aspect.den);
-#if FF_API_SWS_PARAM_OPTION
-    if (c->sws_param)
-        av_log(ctx, AV_LOG_WARNING, "sws_param option is deprecated and ignored\n");
-#endif
     return 0;
 }
     { "pixel_aspect",  "sample aspect ratio",    OFFSET(pixel_aspect),     AV_OPT_TYPE_RATIONAL, { .dbl = 0 }, 0, DBL_MAX, V },
     { "time_base",     NULL,                     OFFSET(time_base),        AV_OPT_TYPE_RATIONAL, { .dbl = 0 }, 0, DBL_MAX, V },
     { "frame_rate",    NULL,                     OFFSET(frame_rate),       AV_OPT_TYPE_RATIONAL, { .dbl = 0 }, 0, DBL_MAX, V },
-#if FF_API_SWS_PARAM_OPTION
-    { "sws_param",     NULL,                     OFFSET(sws_param),        AV_OPT_TYPE_STRING,                    .flags = V },
-#endif
     { NULL },
 };

@@ -35,7 +35,6 @@ · 34 unmodified lines
35	* the public API and may change, break or disappear at any time.	35	* the public API and may change, break or disappear at any time.
36	*/	36	*/
37		37
38	#define FF_API_SWS_PARAM_OPTION (LIBAVFILTER_VERSION_MAJOR < 9)
39	#define FF_API_BUFFERSINK_ALLOC (LIBAVFILTER_VERSION_MAJOR < 9)	38	#define FF_API_BUFFERSINK_ALLOC (LIBAVFILTER_VERSION_MAJOR < 9)
40	#define FF_API_PAD_COUNT (LIBAVFILTER_VERSION_MAJOR < 9)	39	#define FF_API_PAD_COUNT (LIBAVFILTER_VERSION_MAJOR < 9)
41		40

Keyboard shortcuts