# HG changeset patch # User reimar # Date 1252918260 0 # Node ID c7d88fcfd78486f2c9d3fb9efb4ea9748853bcc6 # Parent 342a78c13eebf4d6f900110f3e3f136e64ea5803 Get rid of useless indirection and use the demuxer argument directly instead of ds->demuxer. This makes it also work again with -audiofile without having to add more hacks to demux_demuxers. diff -r 342a78c13eeb -r c7d88fcfd784 libmpdemux/demux_audio.c --- a/libmpdemux/demux_audio.c Mon Sep 14 08:29:18 2009 +0000 +++ b/libmpdemux/demux_audio.c Mon Sep 14 08:51:00 2009 +0000 @@ -528,11 +528,10 @@ } -static int demux_audio_fill_buffer(demuxer_t *demuxer, demux_stream_t *ds) { +static int demux_audio_fill_buffer(demuxer_t *demux, demux_stream_t *ds) { int l; demux_packet_t* dp; sh_audio_t* sh_audio = ds->sh; - demuxer_t* demux = ds->demuxer; da_priv_t* priv = demux->priv; double this_pts = priv->next_pts; stream_t* s = demux->stream;