[MPlayer-dev-eng] [PATCH] MEncoder Multiple file 2 pass fix

[Oded Shimon]

On Sunday 27 February 2005 16:50, Jindrich Makovicka wrote:
> Oded Shimon wrote:
> > On Saturday 26 February 2005 17:03, Jindrich Makovicka wrote:
> >>+        if ((vf->fmt.orig_width != width)
> >>+           || (vf->fmt.orig_height != height)
> >>+           || (vf->fmt.orig_fmt != outfmt)) {
> >>+           
> >> mp_msg(MSGT_MENCODER,MSGL_FATAL,MSGTR_ResolutionDoesntMatch);
> >
> > Is "MSGT_MENCODER" really appropriate here?.. Wouldn't MSGT_VFILTER be
> > more appropriate?
>
> yes, definitely.

I also just noticed, it shouldn't be 'MSGL_FATAL' then, should be 'WARN' or 
'ERROR'.

> but maybe mencoder could eventually produce an 
> additional explanatory message too (something like "failed to initialize
> image filters") instead of just dying when vf_inited < 0.

No need really, such a thing is already printed by the VO init code, which is 
that one that calls this whole config.
It's even in your patch! here:

> +    if(vf_config_wrapper(vf,sh->disp_w,sh->disp_h,
> +                        screen_size_x,screen_size_y,
> +                        fullscreen|(vidmode<<1)|(softzoom<<2)|(flip<<3),
> +                        out_fmt)==0){
>  //                      "MPlayer",out_fmt)){
>         mp_msg(MSGT_CPLAYER,MSGL_WARN,MSGTR_CannotInitVO);
>         sh->vf_inited=-1;

Also, this is a continued mistake from my own patch, in mencoder.c, it should 
be 'vf_inited < 0', not 'vf_inited < 1'. Meant to mention that a while ago, 
forgot. :)

- ods15