Unified · Split
| @@ -21209,9 +21209,9 @@ Specify the frame rate expected for the video stream. · 21208 unmodified lines | |||
| 21209 | The sample (pixel) aspect ratio of the input video. | 21209 | The sample (pixel) aspect ratio of the input video. |
| 21210 | 21210 | ||
| 21211 | @item sws_param | 21211 | @item sws_param |
| 21212 | Specify the optional parameters to be used for the scale filter which | 21212 | This option is deprecated and ignored. Prepend @code{sws_flags=@var{flags};} |
| 21213 | is automatically inserted when an input change is detected in the | 21213 | to the filtergraph description to specify swscale flags for automatically |
| 21214 | input size or format. | 21214 | inserted scalers. See @ref{Filtergraph syntax}. |
| 21215 | 21215 | ||
| 21216 | @item hw_frames_ctx | 21216 | @item hw_frames_ctx |
| 21217 | When using a hardware pixel format, this should be a reference to an | 21217 | When using a hardware pixel format, this should be a reference to an |
| @@ -21236,7 +21236,7 @@ buffer=size=320x240:pixfmt=6:time_base=1/24:pixel_aspect=1/1 · 18 unmodified lines | |||
| 21236 | Alternatively, the options can be specified as a flat string, but this | 21236 | Alternatively, the options can be specified as a flat string, but this |
| 21237 | syntax is deprecated: | 21237 | syntax is deprecated: |
| 21238 | 21238 | ||
| 21239 | @var{width}:@var{height}:@var{pix_fmt}:@var{time_base.num}:@var{time_base.den}:@var{pixel_aspect.num}:@var{pixel_aspect.den}[:@var{sws_param}] | 21239 | @var{width}:@var{height}:@var{pix_fmt}:@var{time_base.num}:@var{time_base.den}:@var{pixel_aspect.num}:@var{pixel_aspect.den} |
| 21240 | 21240 | ||
| 21241 | @section cellauto | 21241 | @section cellauto |
| 21242 | 21242 | ||
| @@ -51,7 +51,9 @@ typedef struct BufferSourceContext { · 50 unmodified lines | |||
| 51 | int w, h; | 51 | int w, h; |
| 52 | enum AVPixelFormat pix_fmt; | 52 | enum AVPixelFormat pix_fmt; |
| 53 | AVRational pixel_aspect; | 53 | AVRational pixel_aspect; |
| 54 | #if FF_API_SWS_PARAM_OPTION | ||
| 54 | char *sws_param; | 55 | char *sws_param; |
| 56 | #endif | ||
| 55 | 57 | ||
| 56 | AVBufferRef *hw_frames_ctx; | 58 | AVBufferRef *hw_frames_ctx; |
| 57 | 59 | ||
| @@ -271,10 +273,16 @@ static av_cold int init_video(AVFilterContext *ctx) · 213 unmodified lines | |||
| 271 | return AVERROR(EINVAL); | 273 | return AVERROR(EINVAL); |
| 272 | } | 274 | } |
| 273 | 275 | ||
| 274 | av_log(ctx, AV_LOG_VERBOSE, "w:%d h:%d pixfmt:%s tb:%d/%d fr:%d/%d sar:%d/%d sws_param:%s\n", | 276 | av_log(ctx, AV_LOG_VERBOSE, "w:%d h:%d pixfmt:%s tb:%d/%d fr:%d/%d sar:%d/%d\n", |
| 275 | c->w, c->h, av_get_pix_fmt_name(c->pix_fmt), | 277 | c->w, c->h, av_get_pix_fmt_name(c->pix_fmt), |
| 276 | c->time_base.num, c->time_base.den, c->frame_rate.num, c->frame_rate.den, | 278 | c->time_base.num, c->time_base.den, c->frame_rate.num, c->frame_rate.den, |
| 277 | c->pixel_aspect.num, c->pixel_aspect.den, (char *)av_x_if_null(c->sws_param, "")); | 279 | c->pixel_aspect.num, c->pixel_aspect.den); |
| 280 | |||
| 281 | #if FF_API_SWS_PARAM_OPTION | ||
| 282 | if (c->sws_param) | ||
| 283 | av_log(ctx, AV_LOG_WARNING, "sws_param option is deprecated and ignored\n"); | ||
| 284 | #endif | ||
| 285 | |||
| 278 | return 0; | 286 | return 0; |
| 279 | } | 287 | } |
| 280 | 288 | ||
| @@ -296,7 +304,9 @@ static const AVOption buffer_options[] = { · 15 unmodified lines | |||
| 296 | { "pixel_aspect", "sample aspect ratio", OFFSET(pixel_aspect), AV_OPT_TYPE_RATIONAL, { .dbl = 0 }, 0, DBL_MAX, V }, | 304 | { "pixel_aspect", "sample aspect ratio", OFFSET(pixel_aspect), AV_OPT_TYPE_RATIONAL, { .dbl = 0 }, 0, DBL_MAX, V }, |
| 297 | { "time_base", NULL, OFFSET(time_base), AV_OPT_TYPE_RATIONAL, { .dbl = 0 }, 0, DBL_MAX, V }, | 305 | { "time_base", NULL, OFFSET(time_base), AV_OPT_TYPE_RATIONAL, { .dbl = 0 }, 0, DBL_MAX, V }, |
| 298 | { "frame_rate", NULL, OFFSET(frame_rate), AV_OPT_TYPE_RATIONAL, { .dbl = 0 }, 0, DBL_MAX, V }, | 306 | { "frame_rate", NULL, OFFSET(frame_rate), AV_OPT_TYPE_RATIONAL, { .dbl = 0 }, 0, DBL_MAX, V }, |
| 307 | #if FF_API_SWS_PARAM_OPTION | ||
| 299 | { "sws_param", NULL, OFFSET(sws_param), AV_OPT_TYPE_STRING, .flags = V }, | 308 | { "sws_param", NULL, OFFSET(sws_param), AV_OPT_TYPE_STRING, .flags = V }, |
| 309 | #endif | ||
| 300 | { NULL }, | 310 | { NULL }, |
| 301 | }; | 311 | }; |
| 302 | 312 | ||
| @@ -31,7 +31,7 @@ · 30 unmodified lines | |||
| 31 | 31 | ||
| 32 | #define LIBAVFILTER_VERSION_MAJOR 7 | 32 | #define LIBAVFILTER_VERSION_MAJOR 7 |
| 33 | #define LIBAVFILTER_VERSION_MINOR 70 | 33 | #define LIBAVFILTER_VERSION_MINOR 70 |
| 34 | #define LIBAVFILTER_VERSION_MICRO 100 | 34 | #define LIBAVFILTER_VERSION_MICRO 101 |
| 35 | 35 | ||
| 36 | 36 | ||
| 37 | #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ | 37 | #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ |
| @@ -59,6 +59,9 @@ · 21 unmodified lines | |||
| 59 | #ifndef FF_API_FILTER_GET_SET | 59 | #ifndef FF_API_FILTER_GET_SET |
| 60 | #define FF_API_FILTER_GET_SET (LIBAVFILTER_VERSION_MAJOR < 8) | 60 | #define FF_API_FILTER_GET_SET (LIBAVFILTER_VERSION_MAJOR < 8) |
| 61 | #endif | 61 | #endif |
| 62 | #ifndef FF_API_SWS_PARAM_OPTION | ||
| 63 | #define FF_API_SWS_PARAM_OPTION (LIBAVFILTER_VERSION_MAJOR < 8) | ||
| 64 | #endif | ||
| 62 | #ifndef FF_API_NEXT | 65 | #ifndef FF_API_NEXT |
| 63 | #define FF_API_NEXT (LIBAVFILTER_VERSION_MAJOR < 8) | 66 | #define FF_API_NEXT (LIBAVFILTER_VERSION_MAJOR < 8) |
| 64 | #endif | 67 | #endif |