diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-09-16 22:28:12 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-09-16 22:28:12 +0300 |
| commit | e1ecc4315265c465080616b8d8d9257b3aab6ee9 (patch) | |
| tree | d8a3aacf1b5468c59da202e44c5035924f5c1a3e /libmpdemux/demux_audio.c | |
| parent | 0e1b7765be878491565cf5e471f22b15e106164c (diff) | |
| parent | 4dae2a980c4313deed6ddb69556d2ead4417119c (diff) | |
| download | mpv-e1ecc4315265c465080616b8d8d9257b3aab6ee9.tar.bz2 mpv-e1ecc4315265c465080616b8d8d9257b3aab6ee9.tar.xz | |
Merge svn changes up to r29684
Diffstat (limited to 'libmpdemux/demux_audio.c')
| -rw-r--r-- | libmpdemux/demux_audio.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libmpdemux/demux_audio.c b/libmpdemux/demux_audio.c index aa950046c6..f20c7d52f1 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; |