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 /stream | |
| 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 'stream')
| -rw-r--r-- | stream/realrtsp/real.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/stream/realrtsp/real.c b/stream/realrtsp/real.c index f20c92e24e..62670f4726 100644 --- a/stream/realrtsp/real.c +++ b/stream/realrtsp/real.c @@ -30,7 +30,7 @@ #include <stdio.h> #include <string.h> -#include "../config.h" +#include "config.h" #include "libavutil/common.h" #include "real.h" #include "asmrp.h" |