[MPlayer-dev-eng] bug in demux_mkv

[Reimar Döffinger]

Hello,
On Sun, Jul 15, 2007 at 10:11:04AM +0200, Reimar D?ffinger wrote:
> On Sun, Jul 15, 2007 at 10:02:52AM +0200, Reimar D?ffinger wrote:
> > On Sat, Jul 14, 2007 at 02:26:56PM -0700, Sean D'Epagnier wrote:
> > > On Sat, Jul 14, 2007 at 11:12:37PM +0200, Aurelien Jacobs wrote:
> > > > 
> > > > Could you please make the sample file available somewhere ?
> > > > 
> > > 
> > > http://people.freedesktop.org/~geckosenator/test.mkv
> > > 
> > > The file was huge so I cut out just the start of it.  This should
> > > be enough to see it crash, but not crash with -aid 0.
> > 
> > MPlayer SVN autodetects it just fine, it only crashes if you specify a
> > stream that does not exist, like -aid 1 or -aid 99.
> > The problem is that track is check for != NULL right after being used
> > instead of before.
> > IMO if no matching track is found, demuxer->audio->id should be set to
> > -2.
> > Is attached patch okay (it also remove the useless track == NULL check
> > in the loop I mentioned above).
> > I'll have another look, the video selection code might have the same
> > issue.
> 
> That one does it correctly. Attached patch fixes it in a way that makes
> the more similar, making it easier to factor out the common code some
> day.

Applied.

Greetings,
Reimar Döffinger