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 /mencoder.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 'mencoder.c')
-rw-r--r-- | mencoder.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mencoder.c b/mencoder.c index bffa3b791d..c834c6bda7 100644 --- a/mencoder.c +++ b/mencoder.c @@ -67,6 +67,7 @@ #include "get_path.h" #include "stream/stream.h" +#include "libmpdemux/aviprint.h" #include "libmpdemux/demuxer.h" #include "libmpdemux/stheader.h" #include "libmpdemux/mp3_hdr.h" @@ -374,8 +375,6 @@ static void exit_sighandler(int x){ static muxer_t* muxer=NULL; -void print_wave_header(WAVEFORMATEX *h, int verbose_level); - int main(int argc,char* argv[]){ stream_t* stream=NULL; |