diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 00:00:06 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 00:00:06 +0200 |
| commit | c37f09693d0edb632c80f8f38ecdb2faf3547f7f (patch) | |
| tree | 44df07eacb522a97bbecd7a3a0f93e8d6a933003 /libmpdemux/demux_asf.c | |
| parent | 22a06c4ae5672c1dd629918d0a279b8af24e35c3 (diff) | |
| parent | 2aafb808284d74edab6e5320e1114f5c74d5881e (diff) | |
| download | mpv-c37f09693d0edb632c80f8f38ecdb2faf3547f7f.tar.bz2 mpv-c37f09693d0edb632c80f8f38ecdb2faf3547f7f.tar.xz | |
Merge svn changes up to r30643
Diffstat (limited to 'libmpdemux/demux_asf.c')
| -rw-r--r-- | libmpdemux/demux_asf.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/libmpdemux/demux_asf.c b/libmpdemux/demux_asf.c index 4d7490e7f8..113b01e372 100644 --- a/libmpdemux/demux_asf.c +++ b/libmpdemux/demux_asf.c @@ -30,16 +30,12 @@ #include "stream/stream.h" #include "asf.h" +#include "asfheader.h" #include "demuxer.h" - +#include "libmpcodecs/dec_audio.h" #include "libvo/fastmemcpy.h" #include "ffmpeg_files/intreadwrite.h" -// defined at asfheader.c: - -int asf_check_header(demuxer_t *demuxer); -int read_asf_header(demuxer_t *demuxer,struct asf_priv* asf); - // based on asf file-format doc by Eugene [http://divx.euro.ru] /** @@ -550,8 +546,6 @@ static int demux_asf_fill_buffer(demuxer_t *demux, demux_stream_t *ds){ #include "stheader.h" -void skip_audio_frame(sh_audio_t *sh_audio); - static void demux_seek_asf(demuxer_t *demuxer,float rel_seek_secs,float audio_delay,int flags){ struct asf_priv* asf = demuxer->priv; demux_stream_t *d_audio=demuxer->audio; |