ffmpeg | branch: master | Paul B Mahol <one...@gmail.com> | Tue Sep 15 18:55:47 2015 +0000| [eeaf19cee981c5fcbc1f4d7e005444a5aa728288] | committer: Paul B Mahol
avfilter/vf_stereo3d: simplify blank calculations and check height Signed-off-by: Paul B Mahol <one...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=eeaf19cee981c5fcbc1f4d7e005444a5aa728288 --- libavfilter/vf_stereo3d.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/libavfilter/vf_stereo3d.c b/libavfilter/vf_stereo3d.c index 02dc948..b0deba3 100644 --- a/libavfilter/vf_stereo3d.c +++ b/libavfilter/vf_stereo3d.c @@ -445,10 +445,12 @@ static int config_output(AVFilterLink *outlink) s->out.row_right = s->height; break; case HDMI: - if (s->in.height <= 720) - s->blanks = 30; - else - s->blanks = 45; + if (s->height != 720 && s->height != 1080) { + av_log(ctx, AV_LOG_ERROR, "Only 720 and 1080 height supported\n"); + return AVERROR(EINVAL); + } + + s->blanks = s->height / 24; s->out.height = s->height * 2 + s->blanks; s->out.row_right = s->height + s->blanks; break; _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
