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/asfheader.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/asfheader.c')
-rw-r--r-- | libmpdemux/asfheader.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/libmpdemux/asfheader.c b/libmpdemux/asfheader.c index 95d5f18e7f..8096ef1240 100644 --- a/libmpdemux/asfheader.c +++ b/libmpdemux/asfheader.c @@ -29,12 +29,13 @@ #include "help_mp.h" #include "stream/stream.h" +#include "aviprint.h" #include "demuxer.h" #include "stheader.h" #include "asf.h" - #include "asfguid.h" +#include "asfheader.h" typedef struct { // must be 0 for metadata record, might be non-zero for metadata lib record @@ -135,10 +136,6 @@ int asf_check_header(demuxer_t *demuxer){ return DEMUXER_TYPE_ASF; } -void print_wave_header(WAVEFORMATEX *h, int verbose_level); -void print_video_header(BITMAPINFOHEADER *h, int verbose_level); - - static int get_ext_stream_properties(char *buf, int buf_len, int stream_num, struct asf_priv* asf, int is_video) { int pos=0; |