[FFmpeg-cvslog] libmpcodecs/vf_pullup: update to latest version from mplayer

multiple authors git at videolan.org
Tue Feb 5 15:48:11 CET 2013


ffmpeg | branch: master | multiple authors <multiple at multiple.x> | Tue Feb  5 14:17:54 2013 +0100| [81e357db625939afec36c7c92a3a0fcf5e21f2e0] | committer: Michael Niedermayer

libmpcodecs/vf_pullup: update to latest version from mplayer

Please see mplayer svn for authorship and individual commits

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=81e357db625939afec36c7c92a3a0fcf5e21f2e0
---

 libavfilter/libmpcodecs/vf_pullup.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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);
 }
 



More information about the ffmpeg-cvslog mailing list