diff options
author | multiple authors <multiple@multiple.x> | 2013-02-05 14:17:54 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-05 15:41:19 +0100 |
commit | 81e357db625939afec36c7c92a3a0fcf5e21f2e0 (patch) | |
tree | c06d6b943de0dce6bfb6837248e91ee73b16d245 /libavfilter/libmpcodecs | |
parent | 13afcdd00eec89538e62d0802c52cc57999caf98 (diff) | |
download | ffmpeg-streaming-81e357db625939afec36c7c92a3a0fcf5e21f2e0.zip ffmpeg-streaming-81e357db625939afec36c7c92a3a0fcf5e21f2e0.tar.gz |
libmpcodecs/vf_pullup: update to latest version from mplayer
Please see mplayer svn for authorship and individual commits
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/libmpcodecs')
-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 1a0de7c..e4a28c4 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); } |