diff libmpdemux/demux_aac.c @ 29263:0f1b5b68af32

whitespace cosmetics: Remove all trailing whitespace.
author diego
date Wed, 13 May 2009 02:58:57 +0000
parents d643e4643313
children 928359c13d93
line wrap: on
line diff
--- a/libmpdemux/demux_aac.c	Tue May 12 19:25:35 2009 +0000
+++ b/libmpdemux/demux_aac.c	Wed May 13 02:58:57 2009 +0000
@@ -48,11 +48,11 @@
 static int demux_aac_init(demuxer_t *demuxer)
 {
 	aac_priv_t *priv;
-	
+
 	priv = calloc(1, sizeof(aac_priv_t));
 	if(!priv)
 		return 0;
-	
+
 	priv->buf = (uint8_t*) malloc(8);
 	if(!priv->buf)
 	{
@@ -67,7 +67,7 @@
 static void demux_close_aac(demuxer_t *demuxer)
 {
 	aac_priv_t *priv = (aac_priv_t *) demuxer->priv;
-	
+
 	if(!priv)
 		return;
 
@@ -85,13 +85,13 @@
 	int cnt = 0, c, len, srate, num;
 	off_t init, probed;
 	aac_priv_t *priv;
-	
+
 	if(! demux_aac_init(demuxer))
 	{
 		mp_msg(MSGT_DEMUX, MSGL_ERR, "COULDN'T INIT aac_demux, exit\n");
 		return 0;
 	}
-	
+
 	priv = (aac_priv_t *) demuxer->priv;
 
 	init = probed = stream_tell(demuxer->stream);
@@ -107,7 +107,7 @@
 		priv->buf[0] = 0xFF;
 		if(stream_read(demuxer->stream, &(priv->buf[1]), 7) < 7)
 			goto fail;
-		
+
 		len = aac_parse_frame(priv->buf, &srate, &num);
 		if(len > 0)
 		{
@@ -120,7 +120,7 @@
 	stream_seek(demuxer->stream, init);
 	if(cnt < 8)
 		goto fail;
-	
+
 	mp_msg(MSGT_DEMUX, MSGL_V, "demux_aac_probe, INIT: %"PRIu64", PROBED: %"PRIu64", cnt: %d\n", init, probed, cnt);
 	return DEMUXER_TYPE_AAC;
 
@@ -140,7 +140,7 @@
 	demuxer->audio->sh = sh;
 
 	demuxer->filepos = stream_tell(demuxer->stream);
-	
+
 	return demuxer;
 }
 
@@ -173,7 +173,7 @@
 		priv->buf[1] = (unsigned char) c2;
 		if(stream_read(demuxer->stream, &(priv->buf[2]), 6) < 6)
 			return 0;
-		
+
 		len = aac_parse_frame(priv->buf, &srate, &num);
 		if(len > 0)
 		{
@@ -183,8 +183,8 @@
 				mp_msg(MSGT_DEMUX, MSGL_ERR, "fill_buffer, NEW_ADD_PACKET(%d)FAILED\n", len);
 				return 0;
 			}
-			
-			
+
+
 			memcpy(dp->buffer, priv->buf, 8);
 			stream_read(demuxer->stream, &(dp->buffer[8]), len-8);
 			if(srate)
@@ -195,10 +195,10 @@
 			ds_add_packet(demuxer->audio, dp);
 			priv->size += len;
 			priv->time += tm;
-			
+
 			priv->bitrate = (int) (priv->size / priv->time);
 			demuxer->filepos = stream_tell(demuxer->stream);
-			
+
 			return len;
 		}
 		else
@@ -220,7 +220,7 @@
 	ds_free_packs(d_audio);
 
 	time = (flags & SEEK_ABSOLUTE) ? rel_seek_secs - priv->last_pts : rel_seek_secs;
-	if(time < 0) 
+	if(time < 0)
 	{
 		stream_seek(demuxer->stream, demuxer->movi_start);
 		time = priv->last_pts + time;
@@ -232,13 +232,13 @@
 		int len, nf, srate, num;
 
 		nf = time * sh_audio->samplerate/1024;
-		
-		while(nf > 0) 
+
+		while(nf > 0)
 		{
 			if(stream_read(demuxer->stream,priv->buf, 8) < 8)
 				break;
 			len = aac_parse_frame(priv->buf, &srate, &num);
-			if(len <= 0) 
+			if(len <= 0)
 			{
 				stream_skip(demuxer->stream, -7);
 				continue;