[MPlayer-dev-eng] TiVo ty files crash pre7 and beyond, patch enclosed

[Kevin Seghetti]

I am new to this list, so forgive me if this is redundant (but I did a
search of the lists and didn't see anything on this). 

MPlayer-1.0pre6a plays ty streams fine, but MPlayer-1.0pre7 crashes
(segfaults) when trying to initialize sound. 

Between pre6a and pre7 the code to remap the sound stream type was
removed from libmpdemux/demuxer.c for both DEMUXER_TYPE_MPEG_TY and
DEMUXER_TYPE_MPEG_PS. I couldn't find anything on the mailing lists
discussing this, so I don't know why.

Enclosed is a patch which puts it back for both (since they were merged
into the same case). If this is not appropriate for DEMUXER_TYPE_MPEG_PS
then an additional check needs to be added, or the cases should be split
again. 
This patch applies cleanly to both pre7 and the 20050428 cvs snapshot. 

What caused it to crash instead of just failing to play audio was the
init function of the pcm sound driver (ad_pcm.c line 20) was getting
called with sh_audio->wf set to NULL. This function doesn't check this
pointer before using it, which causes a seg-fault. I made the function
check the pointer and return 0 if it is NULL, and that fixed the crash,
but it didn't play any sound (since it wasn't the correct driver to be
using).

-- 
Kevin Seghetti: E-Mail: kts at tenetti.org, HTTP: www.tenetti.org
GPG public key: http://tenetti.org/phpwiki/index.php/KevinSeghettiGPGKey
Check out www.worldfoundry.org for my GPL'ed 3D video game engine
Copyright is a temporary loan from the public domain, not property
-------------- next part --------------
A non-text attachment was scrubbed...
Name: mplayer-reenable-tivo-audio.patch
Type: text/x-patch
Size: 763 bytes
Desc: not available
URL: <http://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/attachments/20050430/bc79ca85/attachment.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <http://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/attachments/20050430/bc79ca85/attachment.pgp>