[MPlayer-cvslog] CVS: main/libmpcodecs ad_liba52.c,1.16,1.17

[Zoltan Hidvegi CVS]

CVS change done by Zoltan Hidvegi CVS

Update of /cvsroot/mplayer/main/libmpcodecs
In directory mail:/var2/tmp/cvs-serv19252

Modified Files:
	ad_liba52.c 
Log Message:
Make sure that samplesize is at least 2, as some demuxers set it to 1
(demux_ogg for ac3 in ogm) or possibly even 0, and it causes preinit
to set audio_out_minsize too low, which causes overflow (assert).

Index: ad_liba52.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ad_liba52.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ad_liba52.c	24 May 2005 06:39:01 -0000	1.16
+++ ad_liba52.c	24 May 2005 06:54:19 -0000	1.17
@@ -126,6 +126,7 @@
 {
   /* Dolby AC3 audio: */
   /* however many channels, 2 bytes in a word, 256 samples in a block, 6 blocks in a frame */
+  if (sh->samplesize < 2) sh->samplesize = 2;
   sh->audio_out_minsize=audio_output_channels*sh->samplesize*256*6;
   sh->audio_in_minsize=3840;
   a52_level = 1.0;