MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lavfi/yadif: fail during the configuration stage in case of invalid video size

Browse Source 
This is better than repeatedly failing during the filtering stage.
This commit is contained in:
Stefano Sabatini 2013-01-02 11:17:07 +01:00
parent b52c1d0c99
commit 4ea7c17932
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libavfilter/vf_yadif.c
View File

@ -219,11 +219,6 @@ static int filter_frame(AVFilterLink *link, AVFilterBufferRef *picref)
av_assert0(picref);
if (picref->video->h < 3 || picref->video->w < 3) {
av_log(ctx, AV_LOG_ERROR, "Video of less than 3 columns or lines is not supported\n");
return AVERROR(EINVAL);
}
if (yadif->frame_pending)
return_frame(ctx, 1);
@ -369,7 +364,8 @@ static av_cold int init(AVFilterContext *ctx, const char *args)
static int config_props(AVFilterLink *link)
{
YADIFContext *yadif = link->src->priv;
AVFilterContext *ctx = link->src;
YADIFContext *yadif = ctx->priv;
link->time_base.num = link->src->inputs[0]->time_base.num;
link->time_base.den = link->src->inputs[0]->time_base.den * 2;
@ -379,6 +375,11 @@ static int config_props(AVFilterLink *link)
if(yadif->mode&1)
link->frame_rate = av_mul_q(link->src->inputs[0]->frame_rate, (AVRational){2,1});
if (link->w < 3 || link->h < 3) {
av_log(ctx, AV_LOG_ERROR, "Video of less than 3 columns or lines is not supported\n");
return AVERROR(EINVAL);
}
return 0;
}