diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 01:25:15 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 01:25:15 +0200 |
| commit | acdce0176ae3722ad38a23aae0cf0bf03a82f9c4 (patch) | |
| tree | 57a30f1d44ea193586d5723faac7ffb96a3a73aa /mencoder.c | |
| parent | ef3ef5e218588b5f68b427729a3c2c1a8083e499 (diff) | |
| parent | 5a2289137f43501281dba83fe98b5f67be63f9ef (diff) | |
| download | mpv-acdce0176ae3722ad38a23aae0cf0bf03a82f9c4.tar.bz2 mpv-acdce0176ae3722ad38a23aae0cf0bf03a82f9c4.tar.xz | |
Merge svn changes up to r30732
Diffstat (limited to 'mencoder.c')
| -rw-r--r-- | mencoder.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mencoder.c b/mencoder.c index c834c6bda7..af1b015d90 100644 --- a/mencoder.c +++ b/mencoder.c @@ -63,7 +63,7 @@ #include "m_config.h" #include "parser-mecmd.h" #include "parser-cfg.h" - +#include "mp_fifo.h" #include "get_path.h" #include "stream/stream.h" @@ -73,7 +73,7 @@ #include "libmpdemux/mp3_hdr.h" #include "libmpdemux/muxer.h" - +#include "input/input.h" #include "libvo/video_out.h" #include "libaf/af_format.h" |