diff options
| author | rogerdpack <rogerpack2005@gmail.com> | 2013-01-15 19:09:15 -0700 |
|---|---|---|
| committer | rogerdpack <rogerpack2005@gmail.com> | 2013-01-15 19:09:15 -0700 |
| commit | c540312ac3b58e0bbd751844fc2c47c6e3713cf5 (patch) | |
| tree | fcf92b1c0f1772b379828125c2555a47d1c81c6b /libavfilter/libmpcodecs/vf_pullup.c | |
| parent | 47e88486b4b3b3de992b07f89dfaedf410a8bd5e (diff) | |
| parent | 2b20397e1fbe52db800ef5deb810f7bc2602f248 (diff) | |
| download | ffmpeg-c540312ac3b58e0bbd751844fc2c47c6e3713cf5.tar.gz | |
Merge remote-tracking branch 'origin/master' into combined
Diffstat (limited to 'libavfilter/libmpcodecs/vf_pullup.c')
| -rw-r--r-- | libavfilter/libmpcodecs/vf_pullup.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavfilter/libmpcodecs/vf_pullup.c b/libavfilter/libmpcodecs/vf_pullup.c index 1a0de7c480..e4a28c46d5 100644 --- a/libavfilter/libmpcodecs/vf_pullup.c +++ b/libavfilter/libmpcodecs/vf_pullup.c @@ -270,7 +270,10 @@ static int config(struct vf_instance *vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt) { - if (height&3) return 0; + if (height&3) { + ff_mp_msg(MSGT_VFILTER, MSGL_ERR, "height must be divisible by four\n"); + return 0; + } return ff_vf_next_config(vf, width, height, d_width, d_height, flags, outfmt); } |