Mercurial > mplayer.hg

changeset 24909:55c96e871198

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
10l, priv->use_psm can be 1 only if the format is genmpeg2
author nicodvb
date Fri, 02 Nov 2007 19:52:22 +0000
parents c59a27887e5e
children 74ae00838094
files libmpdemux/muxer_mpeg.c
diffstat 1 files changed, 5 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/libmpdemux/muxer_mpeg.c	Fri Nov 02 19:06:15 2007 +0000
+++ b/libmpdemux/muxer_mpeg.c	Fri Nov 02 19:52:22 2007 +0000
@@ -2228,6 +2228,7 @@
 	muxer_t *muxer = stream->muxer;
 	muxer_priv_t *priv = muxer->priv;
 	uint32_t stream_format;
+	int needs_psm = 0;
 
 	if(stream->type == MUXER_TYPE_AUDIO)
 	{
@@ -2247,7 +2248,7 @@
 			spriv->max_buffer_size = 16*1024;
 		}
 		else if(stream->wf->wFormatTag == AUDIO_AAC1 || stream->wf->wFormatTag == AUDIO_AAC2)
-			priv->use_psm = 1;
+			needs_psm = 1;
 		else if(stream->wf->wFormatTag == AUDIO_MP2 || stream->wf->wFormatTag == AUDIO_MP3)
 			spriv->is_ready = 0;
 	}
@@ -2274,11 +2275,12 @@
 			spriv->is_ready = 1;
 
 		if(!is_mpeg1(stream_format) && !is_mpeg2(stream_format))
-			priv->use_psm = 1;
+			needs_psm = 1;
 	}
 	
-	if(priv->is_genmpeg2 && priv->use_psm)
+	if(priv->is_genmpeg2 && needs_psm)
 	{
+		priv->use_psm = 1;
 		add_to_psm(priv, spriv->id, stream_format);
 		priv->psm_streams_cnt++;
 	}