[MPlayer-cvslog] CVS: main/libmpcodecs vd.c, 1.81, 1.82 ve_divx4.c, 1.16, 1.17 ve_lavc.c, 1.110, 1.111 ve_libdv.c, 1.11, 1.12 ve_nuv.c, 1.4, 1.5 ve_qtvideo.c, 1.12, 1.13 ve_raw.c, 1.4, 1.5 ve_vfw.c, 1.17, 1.18 ve_x264.c, 1.20, 1.21 ve_xvid.c, 1.28, 1.29 ve_xvid4.c, 1.12, 1.13 vf.c, 1.111, 1.112 vf.h, 1.26, 1.27 vfcap.h, 1.3, 1.4

D Richard Felker III dalias at aerifal.cx
Wed Mar 9 03:55:42 CET 2005


On Tue, Mar 08, 2005 at 09:03:16PM +0100, Jindrich Makovicka wrote:
> Oded Shimon wrote:
> >On Tuesday 01 March 2005 22:22, Jindrich Makovicka CVS wrote:
> >
> >>+int vf_config_wrapper(struct vf_instance_s* vf,
> >>+      int width, int height, int d_width, int d_height,
> >>+      unsigned int flags, unsigned int outfmt)
> >>+{
> >>+    if ((vf->default_caps&VFCAP_CONSTANT) && vf->fmt.have_configured) {
> >>+        if ((vf->fmt.orig_width != width)
> >>+     || (vf->fmt.orig_height != height)
> >>+     || (vf->fmt.orig_fmt != outfmt)) {
> >>+            mp_msg(MSGT_VFILTER,MSGL_FATAL,MSGTR_ResolutionDoesntMatch);
> >>+            return 0;
> >>+        }
> >>+        return 1;
> >>+    }
> >>+    vf->fmt.have_configured = 1;
> >>+    vf->fmt.orig_height = height;
> >>+    vf->fmt.orig_width = width;
> >>+    vf->fmt.orig_fmt = outfmt;
> >>+    vf->config(vf, width, height, d_width, d_height, flags, outfmt);
> >>+}
> >
> >
> >1000000l to me and  to Jindrich.
> >There is no "return" in the end...
> >
> >Fact that it worked at all was a mere fluke, and on some circumstances, 
> >this crashed MEncoder horribly...
> 
> Yuck! I cannot believe that it actually worked. Fixed.

It worked because the return value of vf->config was still in eax...on
x86 that is. :)

Rich




More information about the MPlayer-cvslog mailing list