[MPlayer-cvslog] CVS: main/libmpdemux muxer_mpeg.c,1.51,1.52

[Nico Sabbi CVS]

CVS change done by Nico Sabbi CVS

Update of /cvsroot/mplayer/main/libmpdemux
In directory mail:/var2/tmp/cvs-serv15063

Modified Files:
	muxer_mpeg.c 
Log Message:
audio init code was previously moved to fix_parameters() so removed from write_chunk()

Index: muxer_mpeg.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/muxer_mpeg.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- muxer_mpeg.c	22 Apr 2006 13:18:32 -0000	1.51
+++ muxer_mpeg.c	22 Apr 2006 13:25:46 -0000	1.52
@@ -2430,24 +2430,6 @@
 	memcpy(&(s->b_buffer[s->b_buffer_ptr + s->b_buffer_len]), s->buffer, len);
 	s->b_buffer_len += len;
 	
-	if(stream_format == AUDIO_A52)
-	{
-		s->type = 1;
-		s->ckid = be2me_32 (0x1bd);
-		if(s->size == 0) 
-		{
-			spriv->max_pl_size -= 4;
-			if(priv->is_genmpeg1 || priv->is_genmpeg2)
-				fix_audio_sys_header(priv, spriv->id, 0xbd, 58*1024);	//only one audio at the moment
-			spriv->id = 0xbd;
-		}
-	}
-	else if(stream_format == AUDIO_AAC1 || stream_format == AUDIO_AAC2)
-	{
-		if(spriv->size == 0)
-        		priv->use_psm = 1;
-	}
-	
 	parse_audio(s, 0, &nf, &fake_timer, priv->init_adelay, priv->drop);
 	spriv->vframes += nf;
 	sz = max(len, 2 * priv->packet_size);