summaryrefslogtreecommitdiffstats
path: root/player/loadfile.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-06-08 23:54:05 +0200
committerwm4 <wm4@nowhere>2014-06-09 01:20:53 +0200
commit3e2f16a89e625d9798217f39cc5be6211059acf9 (patch)
treeab74ca3b6974058904414bc4ea71cda212de88de /player/loadfile.c
parentda89af10768f75ceec9b9c0256649da6f4d843a2 (diff)
downloadmpv-3e2f16a89e625d9798217f39cc5be6211059acf9.tar.bz2
mpv-3e2f16a89e625d9798217f39cc5be6211059acf9.tar.xz
audio: add a "weak" gapless mode, and make it default
Basically, this allows gapless playback with similar files (including the ordered chapter case), while still being robust in general. The implementation is quite simplistic on purpose, in order to avoid all the weird corner cases that can occur when creating the filter chain. The consequence is that it might do not-gapless playback in more cases when needed, but if that bothers you, you still can use the normal gapless mode. Just using "--gapless-audio" or "--gapless-audio=yes" selects the old mode.
Diffstat (limited to 'player/loadfile.c')
-rw-r--r--player/loadfile.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/player/loadfile.c b/player/loadfile.c
index d79e82911c..cc65aedd6d 100644
--- a/player/loadfile.c
+++ b/player/loadfile.c
@@ -179,6 +179,8 @@ void uninit_player(struct MPContext *mpctx, unsigned int mask)
ao_uninit(ao);
}
mpctx->ao = NULL;
+ talloc_free(mpctx->ao_decoder_fmt);
+ mpctx->ao_decoder_fmt = NULL;
}
if (mask & INITIALIZED_PLAYBACK)