summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoralbeu <albeu@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-03-27 20:27:50 +0000
committeralbeu <albeu@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-03-27 20:27:50 +0000
commitd3524f2c783dcf1f595c32dcf9e3fb4b5096a19e (patch)
tree1fb9646963c2178922dc5029ba9dc7db1153096f
parentdec444e1a933f8daf39f253b39999cec66fec51c (diff)
downloadmpv-d3524f2c783dcf1f595c32dcf9e3fb4b5096a19e.tar.bz2
mpv-d3524f2c783dcf1f595c32dcf9e3fb4b5096a19e.tar.xz
Fix a 100L bug wich killed mencoder timing and switch to the new
config header git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9708 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--libmpdemux/demux_rawaudio.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/libmpdemux/demux_rawaudio.c b/libmpdemux/demux_rawaudio.c
index e6075e9ebb..faa197967a 100644
--- a/libmpdemux/demux_rawaudio.c
+++ b/libmpdemux/demux_rawaudio.c
@@ -6,7 +6,8 @@
#include <unistd.h>
#include <string.h>
-#include "../cfgparser.h"
+#include "../m_option.h"
+#include "../m_config.h"
#include "stream.h"
#include "demuxer.h"
@@ -65,8 +66,8 @@ int demux_rawaudio_fill_buffer(demuxer_t* demuxer, demux_stream_t *ds) {
return 0;
dp = new_demux_packet(l);
- ds->pts = spos / (float)(sh_audio->wf->nAvgBytesPerSec);
- ds->pos = spos;
+ dp->pts = (spos - demuxer->movi_start) / (float)(sh_audio->wf->nAvgBytesPerSec);
+ dp->pos = (spos - demuxer->movi_start);
stream_read(demuxer->stream,dp->buffer,l);
ds_add_packet(ds,dp);
@@ -87,7 +88,7 @@ void demux_rawaudio_seek(demuxer_t *demuxer,float rel_seek_secs,int flags){
pos -= (pos % (sh_audio->channels * sh_audio->samplesize) );
stream_seek(s,pos);
- sh_audio->delay=pos / (float)(sh_audio->wf->nAvgBytesPerSec);
+ //sh_audio->delay=pos / (float)(sh_audio->wf->nAvgBytesPerSec);
resync_audio_stream(sh_audio);
// printf("demux_rawaudio: streamtell=%d\n",(int)stream_tell(demuxer->stream));
}