[MPlayer-cvslog] r26113 - in trunk: mencoder.c mplayer.c

[Reimar Döffinger]

On Thu, Feb 28, 2008 at 10:54:39PM -0500, Rich Felker wrote:
> On Thu, Feb 28, 2008 at 08:41:40PM +0100, reimar wrote:
> > Author: reimar
> > Date: Thu Feb 28 20:41:40 2008
> > New Revision: 26113
> > 
> > Log:
> > Attempt to fix -chapter broken for mkv in r25987
> > 
> > 
> > Modified:
> >    trunk/mencoder.c
> >    trunk/mplayer.c
> > 
> > Modified: trunk/mencoder.c
> > ==============================================================================
> > --- trunk/mencoder.c	(original)
> > +++ trunk/mencoder.c	Thu Feb 28 20:41:40 2008
> > @@ -602,7 +602,8 @@ if(stream->type==STREAMTYPE_DVDNAV){
> >   
> >    if(dvd_chapter>1) {
> >      float pts;
> > -    demuxer_seek_chapter(demuxer, dvd_chapter-1, 1, &pts, NULL, NULL);
> > +    if (demuxer_seek_chapter(demuxer, dvd_chapter-1, 1, &pts, NULL, NULL) >= 0 && pts > -1.0)
> > +      seek_to_sec = pts;
> 
> seek_to_sec does not remotely work for most file types, especially
> dvds. The old -chapter was byte-exact! Please fix this nasty
> regression that makes splitting dvds when encoding essentially
> impossible!

This does not affect DVDs at all, this only has any effect in the cases
that currently do not work at all (mkv specifically), this is the same
way as it is done in command.c, and this is the same as what the code in
demux_mkv.c did that was removed in r25987.