avfilter/vf_stereo3d: simplify blank calculations and check height

Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol 2015-09-15 18:55:47 +00:00
parent 040ddd27bf
commit eeaf19cee9

View File

@ -445,10 +445,12 @@ static int config_output(AVFilterLink *outlink)
s->out.row_right = s->height; s->out.row_right = s->height;
break; break;
case HDMI: case HDMI:
if (s->in.height <= 720) if (s->height != 720 && s->height != 1080) {
s->blanks = 30; av_log(ctx, AV_LOG_ERROR, "Only 720 and 1080 height supported\n");
else return AVERROR(EINVAL);
s->blanks = 45; }
s->blanks = s->height / 24;
s->out.height = s->height * 2 + s->blanks; s->out.height = s->height * 2 + s->blanks;
s->out.row_right = s->height + s->blanks; s->out.row_right = s->height + s->blanks;
break; break;