[MPlayer-cvslog] r22162 - trunk/mplayer.c

[Uoti Urpala]

On Tue, 2007-02-06 at 14:41 +0100, Reimar Doeffinger wrote:
> > Fix multiple appearing or appearing+disappearing subs in the same frame 
> > in non-ASS mode. The latter is common (old sub replaced by new) and 
> > resulted in an incorrect frame where both appeared simultaneously.
> 
> Thanks for fixing my bugs ;-).
> Do you know if this was a regression? I really tried to avoid changing
> behaviour, but well...

I think it was a regression at least for Matroska. For the old code it
didn't matter whether things happened in the same or different frames.

> > -        double nextpts = ds_get_next_pts(d_dvdsub);
> > -        if (nextpts == MP_NOPTS_VALUE || nextpts > curpts)
> > +        double pts = ds_get_next_pts(d_dvdsub);
> > +        if (pts > curpts)
> >            break;
> 
> Hmm... even if it works as it should with current MP_NOPTS_VALUE IMO it
> would be a good idea to add an explicit check for it...

Yes, I thought so too after committing but forgot to change it. I think
this case (pts == MP_NO_PTS_VALUE) should be avoided though; if there's
a subtitle without explicit timestamp the demuxer should set it to the
previous demuxed video pts or something.