Mercurial > mplayer.hg

changeset 36738:e3d879a5f1cf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove DVDNAV audio reset code to avoid issues on title changes.
author reimar
date Fri, 14 Feb 2014 21:34:07 +0000
parents 456840015a07
children 690ca924c15a
files mplayer.c
diffstat 1 files changed, 6 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/mplayer.c	Fri Feb 14 21:34:06 2014 +0000
+++ b/mplayer.c	Fri Feb 14 21:34:07 2014 +0000
@@ -1953,15 +1953,12 @@
         ctx->demuxer->stream_pts = MP_NOPTS_VALUE;
     }
 
-    if (ctx->sh_audio) {
-        // free audio packets and reset
-        ds_free_packs(ctx->d_audio);
-        audio_delay -= ctx->sh_audio->stream_delay;
-        ctx->delay   = -audio_delay;
-        ctx->audio_out->reset();
-        resync_audio_stream(ctx->sh_audio);
-    }
-
+    // This is necessary to make video start in sync after
+    // a still frame. But do not discard pending audio packets,
+    // that causes issues since this code is also called on
+    // title changes (which is possibly a bug in itself *sigh*),
+    // and thus cause tiny audio skips.
+    ctx->delay   = -audio_delay;
     audio_delay = 0.0f;
     mpctx->sub_counts[SUB_SOURCE_DEMUX] = mp_dvdnav_number_of_subs(mpctx->stream);
     if (dvdsub_lang && dvdsub_id == dvdsub_lang_id) {