summaryrefslogtreecommitdiffstats
path: root/libmpdemux
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-09-14 08:51:00 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-09-14 08:51:00 +0000
commitbd44692ac728ac5f47321b0745e0c67b16c9f695 (patch)
treef1317444de46ac11c6f6c4786203adbcbb168dbb /libmpdemux
parent22986e51c14b89dd19ebcca5fdb9bc19ef6e5a40 (diff)
downloadmpv-bd44692ac728ac5f47321b0745e0c67b16c9f695.tar.bz2
mpv-bd44692ac728ac5f47321b0745e0c67b16c9f695.tar.xz
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. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29677 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r--libmpdemux/demux_audio.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/libmpdemux/demux_audio.c b/libmpdemux/demux_audio.c
index f99517e476..726f42bf8b 100644
--- a/libmpdemux/demux_audio.c
+++ b/libmpdemux/demux_audio.c
@@ -528,11 +528,10 @@ static int demux_audio_open(demuxer_t* demuxer) {
}
-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;