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 /liba52 | |
| 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 'liba52')
| -rw-r--r-- | liba52/resample.c | 2 | ||||
| -rw-r--r-- | liba52/test.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/liba52/resample.c b/liba52/resample.c index 97eb928e97..cd87f2050c 100644 --- a/liba52/resample.c +++ b/liba52/resample.c @@ -31,7 +31,7 @@ #include <stdio.h> #include "a52.h" #include "mm_accel.h" -#include "../config.h" +#include "config.h" #include "mangle.h" int (* a52_resample) (float * _f, int16_t * s16)=NULL; diff --git a/liba52/test.c b/liba52/test.c index cbc58be394..57f0596af5 100644 --- a/liba52/test.c +++ b/liba52/test.c @@ -30,7 +30,7 @@ #include "a52.h" #include "mm_accel.h" -#include "../cpudetect.h" +#include "cpudetect.h" static a52_state_t *state; static uint8_t buf[3840]; |