Use full path for #includes from another directory.

Originally committed as revision 13098 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 files changed, 16 insertions, 14 deletions

diff --git a/libavdevice/alldevices.c b/libavdevice/alldevices.c
index 41a40df67c..6dfd350264 100644
--- a/libavdevice/alldevices.c
+++ b/libavdevice/alldevices.c
@@ -17,8 +17,9 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
-#include "avformat.h"
+
 #include "config.h"
+#include "libavformat/avformat.h"
 
 #define REGISTER_MUXER(X,x) { \
           extern AVOutputFormat x##_muxer; \
diff --git a/libavdevice/audio.c b/libavdevice/audio.c
index bb76f0c0d1..6be3ce1037 100644
--- a/libavdevice/audio.c
+++ b/libavdevice/audio.c
@@ -35,9 +35,9 @@
 #include <sys/ioctl.h>
 #include <sys/time.h>
 
-#include "log.h"
-#include "avcodec.h"
-#include "avformat.h"
+#include "libavutil/log.h"
+#include "libavcodec/avcodec.h"
+#include "libavformat/avformat.h"
 
 #define AUDIO_BLOCK_SIZE 4096
 
diff --git a/libavdevice/beosaudio.cpp b/libavdevice/beosaudio.cpp
index d942d7e45d..535f75be57 100644
--- a/libavdevice/beosaudio.cpp
+++ b/libavdevice/beosaudio.cpp
@@ -30,7 +30,7 @@
 #include <SoundPlayer.h>
 
 extern "C" {
-#include "avformat.h"
+#include "libavformat/avformat.h"
 }
 
 #ifdef HAVE_BSOUNDRECORDER
diff --git a/libavdevice/bktr.c b/libavdevice/bktr.c
index 0ea8dfb02c..364e296658 100644
--- a/libavdevice/bktr.c
+++ b/libavdevice/bktr.c
@@ -23,7 +23,8 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
-#include "avformat.h"
+
+#include "libavformat/avformat.h"
 #if defined (HAVE_DEV_BKTR_IOCTL_METEOR_H) && defined (HAVE_DEV_BKTR_IOCTL_BT848_H)
 # include <dev/bktr/ioctl_meteor.h>
 # include <dev/bktr/ioctl_bt848.h>
diff --git a/libavdevice/dv1394.c b/libavdevice/dv1394.c
index fdf8428b5e..8562652e93 100644
--- a/libavdevice/dv1394.c
+++ b/libavdevice/dv1394.c
@@ -29,12 +29,12 @@
 #include <sys/time.h>
 #include <time.h>
 
-#include "avformat.h"
+#include "libavformat/avformat.h"
 
 #undef DV1394_DEBUG
 
+#include "libavformat/dv.h"
 #include "dv1394.h"
-#include "dv.h"
 
 struct dv1394_data {
     int fd;
diff --git a/libavdevice/libdc1394.c b/libavdevice/libdc1394.c
index 36257f083c..7be079e937 100644
--- a/libavdevice/libdc1394.c
+++ b/libavdevice/libdc1394.c
@@ -21,7 +21,7 @@
  */
 
 #include "config.h"
-#include "avformat.h"
+#include "libavformat/avformat.h"
 
 #if ENABLE_LIBDC1394_2
 #include <dc1394/dc1394.h>
diff --git a/libavdevice/v4l.c b/libavdevice/v4l.c
index cc31c27115..20dd53bc32 100644
--- a/libavdevice/v4l.c
+++ b/libavdevice/v4l.c
@@ -20,8 +20,8 @@
  */
 
 #include "config.h"
-#include "avformat.h"
-#include "dsputil.h"
+#include "libavformat/avformat.h"
+#include "libavcodec/dsputil.h"
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c
index 565fa5253f..319983b8fa 100644
--- a/libavdevice/v4l2.c
+++ b/libavdevice/v4l2.c
@@ -28,7 +28,7 @@
  */
 
 #include "config.h"
-#include "avformat.h"
+#include "libavformat/avformat.h"
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
diff --git a/libavdevice/vfwcap.c b/libavdevice/vfwcap.c
index cfd49b600e..5963e6242e 100644
--- a/libavdevice/vfwcap.c
+++ b/libavdevice/vfwcap.c
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "avformat.h"
+#include "libavformat/avformat.h"
 #include <vfw.h>
 #include <windows.h>
 
diff --git a/libavdevice/x11grab.c b/libavdevice/x11grab.c
index 3e3ce31dba..f1375f6deb 100644
--- a/libavdevice/x11grab.c
+++ b/libavdevice/x11grab.c
@@ -36,7 +36,7 @@
  */
 
 #include "config.h"
-#include "avformat.h"
+#include "libavformat/avformat.h"
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>