virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

avfilter/buffersrc: deprecate sws_param option

Browse Source
This commit is contained in:
Zhao Zhili 2019-12-30 13:01:38 +08:00 committed by Nicolas George
parent e20c6d95b2
commit b2491566a6
3 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doc/filters.texi
View File

@ -21209,9 +21209,9 @@ Specify the frame rate expected for the video stream.
The sample (pixel) aspect ratio of the input video. The sample (pixel) aspect ratio of the input video.
@item sws_param @item sws_param
Specify the optional parameters to be used for the scale filter which This option is deprecated and ignored. Prepend @code{sws_flags=@var{flags};}
is automatically inserted when an input change is detected in the to the filtergraph description to specify swscale flags for automatically
input size or format. inserted scalers. See @ref{Filtergraph syntax}.
@item hw_frames_ctx @item hw_frames_ctx
When using a hardware pixel format, this should be a reference to an 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
Alternatively, the options can be specified as a flat string, but this Alternatively, the options can be specified as a flat string, but this
syntax is deprecated: syntax is deprecated:
@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}] @var{width}:@var{height}:@var{pix_fmt}:@var{time_base.num}:@var{time_base.den}:@var{pixel_aspect.num}:@var{pixel_aspect.den}
@section cellauto @section cellauto

14
libavfilter/buffersrc.c
View File

@ -51,7 +51,9 @@ typedef struct BufferSourceContext {
int w, h; int w, h;
enum AVPixelFormat pix_fmt; enum AVPixelFormat pix_fmt;
AVRational pixel_aspect; AVRational pixel_aspect;
#if FF_API_SWS_PARAM_OPTION
char *sws_param; char *sws_param;
#endif
AVBufferRef *hw_frames_ctx; AVBufferRef *hw_frames_ctx;
@ -271,10 +273,16 @@ static av_cold int init_video(AVFilterContext *ctx)
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }
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", av_log(ctx, AV_LOG_VERBOSE, "w:%d h:%d pixfmt:%s tb:%d/%d fr:%d/%d sar:%d/%d\n",
c->w, c->h, av_get_pix_fmt_name(c->pix_fmt), c->w, c->h, av_get_pix_fmt_name(c->pix_fmt),
c->time_base.num, c->time_base.den, c->frame_rate.num, c->frame_rate.den, c->time_base.num, c->time_base.den, c->frame_rate.num, c->frame_rate.den,
c->pixel_aspect.num, c->pixel_aspect.den, (char *)av_x_if_null(c->sws_param, "")); 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; return 0;
} }
@ -296,7 +304,9 @@ static const AVOption buffer_options[] = {
{ "pixel_aspect", "sample aspect ratio", OFFSET(pixel_aspect), AV_OPT_TYPE_RATIONAL, { .dbl = 0 }, 0, DBL_MAX, V }, { "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 }, { "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 }, { "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 }, { "sws_param", NULL, OFFSET(sws_param), AV_OPT_TYPE_STRING, .flags = V },
#endif
{ NULL }, { NULL },
}; };

5
libavfilter/version.h
View File

@ -31,7 +31,7 @@
#define LIBAVFILTER_VERSION_MAJOR 7 #define LIBAVFILTER_VERSION_MAJOR 7
#define LIBAVFILTER_VERSION_MINOR 70 #define LIBAVFILTER_VERSION_MINOR 70
#define LIBAVFILTER_VERSION_MICRO 100 #define LIBAVFILTER_VERSION_MICRO 101
#define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
@ -59,6 +59,9 @@
#ifndef FF_API_FILTER_GET_SET #ifndef FF_API_FILTER_GET_SET
#define FF_API_FILTER_GET_SET (LIBAVFILTER_VERSION_MAJOR < 8) #define FF_API_FILTER_GET_SET (LIBAVFILTER_VERSION_MAJOR < 8)
#endif #endif
#ifndef FF_API_SWS_PARAM_OPTION
#define FF_API_SWS_PARAM_OPTION (LIBAVFILTER_VERSION_MAJOR < 8)
#endif
#ifndef FF_API_NEXT #ifndef FF_API_NEXT
#define FF_API_NEXT (LIBAVFILTER_VERSION_MAJOR < 8) #define FF_API_NEXT (LIBAVFILTER_VERSION_MAJOR < 8)
#endif #endif