summaryrefslogtreecommitdiffstats
path: root/audio/out/ao_lavc.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2020-05-27 21:04:32 +0200
committerwm4 <wm4@nowhere>2020-05-27 21:04:32 +0200
commit9885952c2a0698e88ec34a2cb9fcef7a6fd69fbb (patch)
tree070d1543c670e91e37924469db37948c295e7227 /audio/out/ao_lavc.c
parent1b03970d79d06b18d0023a87c33fc546c1f988b5 (diff)
downloadmpv-9885952c2a0698e88ec34a2cb9fcef7a6fd69fbb.tar.bz2
mpv-9885952c2a0698e88ec34a2cb9fcef7a6fd69fbb.tar.xz
audio: remove ao_driver.drain
The recent change to the common code removed all calls to ->drain. It's currently emulated via a timed sleep and polling ao_eof_reached(). That is actually fallback code for AOs which lacked draining. I could just readd the drain call, but it was a bad idea anyway. My plan to handle this better is to require the AO to signal a underrun, even if AOPLAY_FINAL_CHUNK is not set. Also reinstate not possibly waiting for ao_lavc.c. ao_pcm.c did not have anything to handle this; whatever.
Diffstat (limited to 'audio/out/ao_lavc.c')
-rw-r--r--audio/out/ao_lavc.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/audio/out/ao_lavc.c b/audio/out/ao_lavc.c
index a38c01e0b2..ad3865964c 100644
--- a/audio/out/ao_lavc.c
+++ b/audio/out/ao_lavc.c
@@ -345,11 +345,6 @@ static int play(struct ao *ao, void **data, int samples, int flags)
return taken;
}
-static void drain(struct ao *ao)
-{
- // pretend we support it, so generic code doesn't force a wait
-}
-
const struct ao_driver audio_out_lavc = {
.encode = true,
.description = "audio encoding using libavcodec",
@@ -361,7 +356,6 @@ const struct ao_driver audio_out_lavc = {
.uninit = uninit,
.get_space = get_space,
.play = play,
- .drain = drain,
};
// vim: sw=4 ts=4 et tw=80