aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2005-12-05 20:44:56 +0000
committerDiego Biurrun <diego@biurrun.de>2005-12-05 20:44:56 +0000
commit6f72dcf7e7cdafe23a1628297d46c4af97d49676 (patch)
tree2c3fee8cbed72a5281e0eaacc3a2201970fd3423
parent2e70e4aa570d02cc9d32a775ba9accdff3901181 (diff)
downloadffmpeg-6f72dcf7e7cdafe23a1628297d46c4af97d49676.tar.gz
Unify include paths, -I.. is in CFLAGS.
Originally committed as revision 4720 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavformat/barpainet.h2
-rw-r--r--libavformat/grab.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/barpainet.h b/libavformat/barpainet.h
index 665fe2ab14..282f7413a5 100644
--- a/libavformat/barpainet.h
+++ b/libavformat/barpainet.h
@@ -1,7 +1,7 @@
#ifndef BARPA_INET_H
#define BARPA_INET_H
-#include "../config.h"
+#include "config.h"
#ifdef CONFIG_BEOS_NETSERVER
diff --git a/libavformat/grab.c b/libavformat/grab.c
index 18a1d06588..201db86304 100644
--- a/libavformat/grab.c
+++ b/libavformat/grab.c
@@ -420,7 +420,7 @@ static int aiw_init(VideoData *s)
}
#ifdef HAVE_MMX
-#include "../libavcodec/i386/mmx.h"
+#include "libavcodec/i386/mmx.h"
#define LINE_WITH_UV \
movq_m2r(ptr[0],mm0); \
@@ -571,7 +571,7 @@ static int aiw_init(VideoData *s)
movd_r2m(mm1,lum_m2[(ptroff)]);
#else
-#include "../libavcodec/dsputil.h"
+#include "libavcodec/dsputil.h"
#define LINE_WITH_UV \
lum[0]=ptr[0];lum[1]=ptr[2];lum[2]=ptr[4];lum[3]=ptr[6];\