Commit e55092b1 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'f6b6d6ac'

* commit 'f6b6d6ac':
  vf_frei0r: use the name 's' for the pointer to the private context
  vf_format: use the name 's' for the pointer to the private context
  vf_fieldorder: use the name 's' for the pointer to the private context
  vf_fieldorder: cosmetics, remove an extra linebreak

Conflicts:
	libavfilter/vf_frei0r.c
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents afec02af f6b6d6ac
......@@ -69,15 +69,13 @@ static int query_formats(AVFilterContext *ctx)
static int config_input(AVFilterLink *inlink)
{
AVFilterContext *ctx = inlink->dst;
FieldOrderContext *fieldorder = ctx->priv;
FieldOrderContext *s = ctx->priv;
int plane;
/** full an array with the number of bytes that the video
* data occupies per line for each plane of the input video */
for (plane = 0; plane < 4; plane++) {
fieldorder->line_size[plane] = av_image_get_linesize(
inlink->format,
inlink->w,
s->line_size[plane] = av_image_get_linesize(inlink->format, inlink->w,
plane);
}
......
......@@ -50,14 +50,14 @@ typedef struct {
static av_cold int init(AVFilterContext *ctx)
{
FormatContext *format = ctx->priv;
FormatContext *s = ctx->priv;
const char *cur, *sep;
char pix_fmt_name[AV_PIX_FMT_NAME_MAXSIZE];
int pix_fmt_name_len, ret;
enum AVPixelFormat pix_fmt;
/* parse the list of formats */
for (cur = format->pix_fmts; cur; cur = sep ? sep + 1 : NULL) {
for (cur = s->pix_fmts; cur; cur = sep ? sep + 1 : NULL) {
if (!(sep = strchr(cur, '|')))
pix_fmt_name_len = strlen(cur);
else
......@@ -73,13 +73,13 @@ static av_cold int init(AVFilterContext *ctx)
if ((ret = ff_parse_pixel_format(&pix_fmt, pix_fmt_name, ctx)) < 0)
return ret;
format->listed_pix_fmt_flags[pix_fmt] = 1;
s->listed_pix_fmt_flags[pix_fmt] = 1;
}
return 0;
}
static AVFilterFormats *make_format_list(FormatContext *format, int flag)
static AVFilterFormats *make_format_list(FormatContext *s, int flag)
{
AVFilterFormats *formats;
enum AVPixelFormat pix_fmt;
......@@ -88,7 +88,7 @@ static AVFilterFormats *make_format_list(FormatContext *format, int flag)
formats->formats = av_malloc(sizeof(enum AVPixelFormat) * AV_PIX_FMT_NB);
for (pix_fmt = 0; pix_fmt < AV_PIX_FMT_NB; pix_fmt++)
if (format->listed_pix_fmt_flags[pix_fmt] == flag)
if (s->listed_pix_fmt_flags[pix_fmt] == flag)
formats->formats[formats->format_count++] = pix_fmt;
return formats;
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment