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.