diff options
| author | nicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-11-02 19:52:22 +0000 |
|---|---|---|
| committer | nicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-11-02 19:52:22 +0000 |
| commit | a5541ee85b37f78611cd945992862c9c2e512dca (patch) | |
| tree | f4c71594fcd467230630104e7917eb3bf569a47b /libmpdemux | |
| parent | cd0c142521ac2611fbc2935e8d86cc94634af73d (diff) | |
| download | mpv-a5541ee85b37f78611cd945992862c9c2e512dca.tar.bz2 mpv-a5541ee85b37f78611cd945992862c9c2e512dca.tar.xz | |
10l, priv->use_psm can be 1 only if the format is genmpeg2
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24937 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/muxer_mpeg.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libmpdemux/muxer_mpeg.c b/libmpdemux/muxer_mpeg.c index a678f50ee3..0ad1015f92 100644 --- a/libmpdemux/muxer_mpeg.c +++ b/libmpdemux/muxer_mpeg.c @@ -2228,6 +2228,7 @@ static void fix_parameters(muxer_stream_t *stream) 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 @@ static void fix_parameters(muxer_stream_t *stream) 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 @@ static void fix_parameters(muxer_stream_t *stream) 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++; } |