diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-09-16 19:51:13 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-09-16 19:51:13 +0000 |
| commit | 6068c1846eea74b972e66096f44d9141c788f1b6 (patch) | |
| tree | bce38ffb99c3afe488308fbef960e28ffdb7a8ed /libmpdemux/demuxer.c | |
| parent | 378ded9169daf7da5f35e29829e03284f1b6127b (diff) | |
| download | mpv-6068c1846eea74b972e66096f44d9141c788f1b6.tar.bz2 mpv-6068c1846eea74b972e66096f44d9141c788f1b6.tar.xz | |
moved sh_audio initialization from dec_audio to demuxer.c to fix
-hr-mp3-seek bug (pts was -inf after seeking) and remove the workaround
from demux_audio.c.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13358 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demuxer.c')
| -rw-r--r-- | libmpdemux/demuxer.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c index aa8a61d755..35b87aca76 100644 --- a/libmpdemux/demuxer.c +++ b/libmpdemux/demuxer.c @@ -18,6 +18,7 @@ #include "stheader.h" #include "mf.h" +#include "../libao2/afmt.h" #include "../libvo/fastmemcpy.h" void free_demuxer_stream(demux_stream_t *ds){ @@ -79,9 +80,15 @@ sh_audio_t* new_sh_audio(demuxer_t *demuxer,int id){ if(demuxer->a_streams[id]){ mp_msg(MSGT_DEMUXER,MSGL_WARN,MSGTR_AudioStreamRedefined,id); } else { + sh_audio_t *sh; mp_msg(MSGT_DEMUXER,MSGL_V,MSGTR_FoundAudioStream,id); demuxer->a_streams[id]=malloc(sizeof(sh_audio_t)); memset(demuxer->a_streams[id],0,sizeof(sh_audio_t)); + sh = demuxer->a_streams[id]; + // set some defaults + sh->samplesize=2; + sh->sample_format=AFMT_S16_NE; + sh->audio_out_minsize=8192;/* default size, maybe not enough for Win32/ACM*/ } return demuxer->a_streams[id]; } |