RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

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
This commit is contained in:
nicodvb 2007-11-02 19:52:22 +00:00
parent cd0c142521
commit a5541ee85b
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libmpdemux/muxer_mpeg.c
View File

@ -2228,6 +2228,7 @@ static void fix_parameters(muxer_stream_t *stream)
muxer_t *muxer = stream->muxer; muxer_t *muxer = stream->muxer;
muxer_priv_t *priv = muxer->priv; muxer_priv_t *priv = muxer->priv;
uint32_t stream_format; uint32_t stream_format;
int needs_psm = 0;
if(stream->type == MUXER_TYPE_AUDIO) if(stream->type == MUXER_TYPE_AUDIO)
{ {
@ -2247,7 +2248,7 @@ static void fix_parameters(muxer_stream_t *stream)
spriv->max_buffer_size = 16*1024; spriv->max_buffer_size = 16*1024;
} }
else if(stream->wf->wFormatTag == AUDIO_AAC1 || stream->wf->wFormatTag == AUDIO_AAC2) 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) else if(stream->wf->wFormatTag == AUDIO_MP2 || stream->wf->wFormatTag == AUDIO_MP3)
spriv->is_ready = 0; spriv->is_ready = 0;
} }
@ -2274,11 +2275,12 @@ static void fix_parameters(muxer_stream_t *stream)
spriv->is_ready = 1; spriv->is_ready = 1;
if(!is_mpeg1(stream_format) && !is_mpeg2(stream_format)) 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); add_to_psm(priv, spriv->id, stream_format);
priv->psm_streams_cnt++; priv->psm_streams_cnt++;
} }