summaryrefslogtreecommitdiffstats
path: root/libmpdemux
diff options
context:
space:
mode:
authornicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-04-22 13:25:46 +0000
committernicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-04-22 13:25:46 +0000
commit6ba9d6ce2035a357e04f3cca7debeda77b3462d8 (patch)
tree54ec11ec8861a213e72e463adcbc23343f63170f /libmpdemux
parent53604e0c213846a6b3cb8f92137c285c7d6ad185 (diff)
downloadmpv-6ba9d6ce2035a357e04f3cca7debeda77b3462d8.tar.bz2
mpv-6ba9d6ce2035a357e04f3cca7debeda77b3462d8.tar.xz
audio init code was previously moved to fix_parameters() so removed from write_chunk()
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18187 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r--libmpdemux/muxer_mpeg.c18
1 files changed, 0 insertions, 18 deletions
diff --git a/libmpdemux/muxer_mpeg.c b/libmpdemux/muxer_mpeg.c
index 2274e0595b..2fb514b885 100644
--- a/libmpdemux/muxer_mpeg.c
+++ b/libmpdemux/muxer_mpeg.c
@@ -2430,24 +2430,6 @@ static void mpegfile_write_chunk(muxer_stream_t *s,size_t len,unsigned int flags
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);