virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-05-13 21:26:33 +02:00
Code Issues Releases Activity

lavfi/aspect: rename field aspect->aspect to aspect->ratio

Browse Source 
The new name is more sensible.
This commit is contained in:
Stefano Sabatini 2012-01-24 22:47:32 +01:00
parent d21b82fd3a
commit 0349d61eef
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libavfilter/vf_aspect.c
View File

@ -28,7 +28,7 @@
#include "avfilter.h" #include "avfilter.h"
typedef struct { typedef struct {
AVRational aspect; AVRational ratio;
} AspectContext; } AspectContext;
static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque) static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque)
@ -37,14 +37,14 @@ static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque)
int ret; int ret;
if (args) { if (args) {
if ((ret = av_parse_ratio(&aspect->aspect, args, 100, 0, ctx)) < 0 || if ((ret = av_parse_ratio(&aspect->ratio, args, 100, 0, ctx)) < 0 ||
aspect->aspect.num < 0 || aspect->aspect.den <= 0) { aspect->ratio.num < 0 || aspect->ratio.den <= 0) {
av_log(ctx, AV_LOG_ERROR, av_log(ctx, AV_LOG_ERROR,
"Invalid string '%s' for aspect ratio.\n", args); "Invalid string '%s' for aspect ratio.\n", args);
return ret; return ret;
} }
av_log(ctx, AV_LOG_INFO, "a:%d/%d\n", aspect->aspect.num, aspect->aspect.den); av_log(ctx, AV_LOG_INFO, "a:%d/%d\n", aspect->ratio.num, aspect->ratio.den);
} }
return 0; return 0;
} }
@ -53,7 +53,7 @@ static void start_frame(AVFilterLink *link, AVFilterBufferRef *picref)
{ {
AspectContext *aspect = link->dst->priv; AspectContext *aspect = link->dst->priv;
picref->video->sample_aspect_ratio = aspect->aspect; picref->video->sample_aspect_ratio = aspect->ratio;
avfilter_start_frame(link->dst->outputs[0], picref); avfilter_start_frame(link->dst->outputs[0], picref);
} }
@ -62,16 +62,16 @@ static void start_frame(AVFilterLink *link, AVFilterBufferRef *picref)
static int setdar_config_props(AVFilterLink *inlink) static int setdar_config_props(AVFilterLink *inlink)
{ {
AspectContext *aspect = inlink->dst->priv; AspectContext *aspect = inlink->dst->priv;
AVRational dar = aspect->aspect; AVRational dar = aspect->ratio;
av_reduce(&aspect->aspect.num, &aspect->aspect.den, av_reduce(&aspect->ratio.num, &aspect->ratio.den,
aspect->aspect.num * inlink->h, aspect->ratio.num * inlink->h,
aspect->aspect.den * inlink->w, 100); aspect->ratio.den * inlink->w, 100);
av_log(inlink->dst, AV_LOG_INFO, "w:%d h:%d -> dar:%d/%d sar:%d/%d\n", av_log(inlink->dst, AV_LOG_INFO, "w:%d h:%d -> dar:%d/%d sar:%d/%d\n",
inlink->w, inlink->h, dar.num, dar.den, aspect->aspect.num, aspect->aspect.den); inlink->w, inlink->h, dar.num, dar.den, aspect->ratio.num, aspect->ratio.den);
inlink->sample_aspect_ratio = aspect->aspect; inlink->sample_aspect_ratio = aspect->ratio;
return 0; return 0;
} }
@ -104,7 +104,7 @@ static int setsar_config_props(AVFilterLink *inlink)
{ {
AspectContext *aspect = inlink->dst->priv; AspectContext *aspect = inlink->dst->priv;
inlink->sample_aspect_ratio = aspect->aspect; inlink->sample_aspect_ratio = aspect->ratio;
return 0; return 0;
} }