diff options
| author | uau <uau@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-03-11 06:16:14 +0000 |
|---|---|---|
| committer | uau <uau@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-03-11 06:16:14 +0000 |
| commit | c60af33716cee5c4f515b47308c5a43556624990 (patch) | |
| tree | 96aae4fa1495e9ae028bdb3973a318504fd9fb7b /libmpdemux | |
| parent | ccb97f109804f236bc13d25c200dbdc01c0a93cb (diff) | |
| download | mpv-c60af33716cee5c4f515b47308c5a43556624990.tar.bz2 mpv-c60af33716cee5c4f515b47308c5a43556624990.tar.xz | |
Move the sh_audio->delay field to mpctx->delay.
The value is related to overall a/v sync and is not used by audio
demuxers or decoders.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22506 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/demuxer.c | 1 | ||||
| -rw-r--r-- | libmpdemux/stheader.h | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c index f41a8b4ffc..1ab2f37bd3 100644 --- a/libmpdemux/demuxer.c +++ b/libmpdemux/demuxer.c @@ -929,7 +929,6 @@ if(!demuxer->seekable){ #if 0 if(sh_audio) sh_audio->timer=sh_video->timer; #else - if(sh_audio) sh_audio->delay=0; if(sh_video) sh_video->timer=0; // !!!!!! #endif diff --git a/libmpdemux/stheader.h b/libmpdemux/stheader.h index 4559a15413..fc57100625 100644 --- a/libmpdemux/stheader.h +++ b/libmpdemux/stheader.h @@ -12,7 +12,6 @@ typedef struct { struct codecs_st *codec; unsigned int format; int inited; - double delay; // relative (to sh_video->timer) time in audio stream float stream_delay; // number of seconds stream should be delayed (according to dwStart or similar) // output format: int sample_format; |