diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-04-29 04:34:58 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-04-29 05:03:57 +0300 |
| commit | 06a35804f37754e2d6ec5bdebe9d83fcddb1caf6 (patch) | |
| tree | eb14069a6843691395ed20773c8768e91a5c1153 /input | |
| parent | e1ef11f0f62cac4a848a4cc9bba2f06dee8fd362 (diff) | |
| parent | 7398abf3899f953eda95d925df6bcc64b08461ed (diff) | |
| download | mpv-06a35804f37754e2d6ec5bdebe9d83fcddb1caf6.tar.bz2 mpv-06a35804f37754e2d6ec5bdebe9d83fcddb1caf6.tar.xz | |
Merge svn changes up to r26587
Conflicts:
Makefile
configure
osdep/timer-darwin.c
Diffstat (limited to 'input')
| -rw-r--r-- | input/input.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/input/input.c b/input/input.c index ac1a9d2b30..74312bbb7f 100644 --- a/input/input.c +++ b/input/input.c @@ -20,7 +20,7 @@ #include "osdep/getch2.h" #include "osdep/keycodes.h" #include "osdep/timer.h" -#include "avstring.h" +#include "libavutil/avstring.h" #include "mp_msg.h" #include "help_mp.h" #include "m_config.h" |