Showing the changes to libavfilter (2 of 2 files). Show all
Unified · Split
| @@ -50,9 +50,6 @@ typedef struct BufferSourceContext { · 49 unmodified lines | |||
| 50 | int w, h; | 50 | int w, h; |
| 51 | enum AVPixelFormat pix_fmt; | 51 | enum AVPixelFormat pix_fmt; |
| 52 | AVRational pixel_aspect; | 52 | AVRational pixel_aspect; |
| 53 | #if FF_API_SWS_PARAM_OPTION | ||
| 54 | char *sws_param; | ||
| 55 | #endif | ||
| 56 | 53 | ||
| 57 | AVBufferRef *hw_frames_ctx; | 54 | AVBufferRef *hw_frames_ctx; |
| 58 | 55 | ||
| @@ -287,11 +284,6 @@ static av_cold int init_video(AVFilterContext *ctx) · 228 unmodified lines | |||
| 287 | c->time_base.num, c->time_base.den, c->frame_rate.num, c->frame_rate.den, | 284 | c->time_base.num, c->time_base.den, c->frame_rate.num, c->frame_rate.den, |
| 288 | c->pixel_aspect.num, c->pixel_aspect.den); | 285 | c->pixel_aspect.num, c->pixel_aspect.den); |
| 289 | 286 | ||
| 290 | #if FF_API_SWS_PARAM_OPTION | ||
| 291 | if (c->sws_param) | ||
| 292 | av_log(ctx, AV_LOG_WARNING, "sws_param option is deprecated and ignored\n"); | ||
| 293 | #endif | ||
| 294 | |||
| 295 | return 0; | 287 | return 0; |
| 296 | } | 288 | } |
| 297 | 289 | ||
| @@ -313,9 +305,6 @@ static const AVOption buffer_options[] = { · 15 unmodified lines | |||
| 313 | { "pixel_aspect", "sample aspect ratio", OFFSET(pixel_aspect), AV_OPT_TYPE_RATIONAL, { .dbl = 0 }, 0, DBL_MAX, V }, | 305 | { "pixel_aspect", "sample aspect ratio", OFFSET(pixel_aspect), AV_OPT_TYPE_RATIONAL, { .dbl = 0 }, 0, DBL_MAX, V }, |
| 314 | { "time_base", NULL, OFFSET(time_base), AV_OPT_TYPE_RATIONAL, { .dbl = 0 }, 0, DBL_MAX, V }, | 306 | { "time_base", NULL, OFFSET(time_base), AV_OPT_TYPE_RATIONAL, { .dbl = 0 }, 0, DBL_MAX, V }, |
| 315 | { "frame_rate", NULL, OFFSET(frame_rate), AV_OPT_TYPE_RATIONAL, { .dbl = 0 }, 0, DBL_MAX, V }, | 307 | { "frame_rate", NULL, OFFSET(frame_rate), AV_OPT_TYPE_RATIONAL, { .dbl = 0 }, 0, DBL_MAX, V }, |
| 316 | #if FF_API_SWS_PARAM_OPTION | ||
| 317 | { "sws_param", NULL, OFFSET(sws_param), AV_OPT_TYPE_STRING, .flags = V }, | ||
| 318 | #endif | ||
| 319 | { NULL }, | 308 | { NULL }, |
| 320 | }; | 309 | }; |
| 321 | 310 | ||
| @@ -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 | ||