2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index a70fded..c36ab12 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@ User johns
 Date:
 
     Release Version 0.5.1
+    Guard audio skip against old PTS values.
+    Improved audio skip, after channel switch.
     Setup add preview of collapsed tree.
     Fix bug: dvd plugin times out.
     Makes OSD size configurable.
diff --git a/audio.c b/audio.c
index adb19c7..f7fcc41 100644
--- a/audio.c
+++ b/audio.c
@@ -3750,9 +3750,12 @@ void AudioVideoReady(int64_t pts)
 	skip =
 	    pts - 15 * 20 * 90 - AudioBufferTime * 90 - audio_pts +
 	    VideoAudioDelay;
+#ifdef DEBUG
 	printf("%dms %dms %dms\n", (int)(pts - audio_pts) / 90,
 	    VideoAudioDelay / 90, skip / 90);
-	if (1 && skip > 0) {
+#endif
+	// guard against old PTS
+	if (skip> 0 && skip < 2000 * 90) {
 	    skip = (((int64_t) skip * AudioRing[AudioRingWrite].HwSampleRate)
 		/ (1000 * 90))
 		* AudioRing[AudioRingWrite].HwChannels * AudioBytesProSample;