[MPlayer-cygwin] Reimar's decoding fix, fix?

[Erik Augustson]

Greetings,

I upgraded to current CVS, and saw the thread on the devel list about Reimar's
decoding patch. It gives an error about:

ad_libmad.c: In function `init':
ad_libmad.c:91: `sh_audio' undeclared (first use in this function)
ad_libmad.c:91: (Each undeclared identifier is reported only once
ad_libmad.c:91: for each function it appears in.)
make[1]: *** [ad_libmad.o] Error 1
make[1]: Leaving directory `/mingw/MPlayer-20040921/libmpcodecs'
make: *** [libmpcodecs/libmpcodecs.a] Error 2

The relevant part is here:

Index: libmpcodecs/ad_libmad.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ad_libmad.c,v
retrieving revision 1.3
diff -u -r1.3 ad_libmad.c
--- libmpcodecs/ad_libmad.c	30 Aug 2002 21:44:20 -0000	1.3
+++ libmpcodecs/ad_libmad.c	21 Sep 2004 18:52:37 -0000
 <at>  <at>  -88,6 +88,7  <at>  <at> 
   sh->channels=(this->frame.header.mode == MAD_MODE_SINGLE_CHANNEL) ? 1 : 2;
   sh->samplerate=this->frame.header.samplerate;
   sh->i_bps=this->frame.header.bitrate/8;
+  sh_audio->samplesize=2;

   return 1;
 }

And compiled fine when changed to sh->samplesize=2; Is this the correct fix?

Regards,
Erik