diff options
| author | corey <corey@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-02-17 01:57:41 +0000 |
|---|---|---|
| committer | corey <corey@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-02-17 01:57:41 +0000 |
| commit | 1ab575101ab9e2e250d782b4e104fcca1c1c66b0 (patch) | |
| tree | 740c93933a4d6c891deccda22ab985c333951981 /libmpdemux/demux_aac.c | |
| parent | 808ce9a03a6d2f810ab3616c33105a08b987f07c (diff) | |
| download | mpv-1ab575101ab9e2e250d782b4e104fcca1c1c66b0.tar.bz2 mpv-1ab575101ab9e2e250d782b4e104fcca1c1c66b0.tar.xz | |
Second-try commit of this patch.
1. Include audio_delay as an argument to demux_seek.
2. Modify demux_seek_avi to adjust the audio/video stream positions so
that mplayer/mencoder will instantly be in sync even when -delay is
specified.
I've quadruple checked this time; hopefully I haven't missed anything.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17637 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demux_aac.c')
| -rw-r--r-- | libmpdemux/demux_aac.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libmpdemux/demux_aac.c b/libmpdemux/demux_aac.c index 840ce866a0..eb0d853933 100644 --- a/libmpdemux/demux_aac.c +++ b/libmpdemux/demux_aac.c @@ -207,7 +207,7 @@ static int demux_aac_fill_buffer(demuxer_t *demuxer, demux_stream_t *ds) //This is an almost verbatim copy of high_res_mp3_seek(), from demux_audio.c -static void demux_aac_seek(demuxer_t *demuxer, float rel_seek_secs, int flags) +static void demux_aac_seek(demuxer_t *demuxer, float rel_seek_secs, float audio_delay, int flags) { aac_priv_t *priv = (aac_priv_t *) demuxer->priv; demux_stream_t *d_audio=demuxer->audio; |