[FFmpeg-cvslog] Drop pointless directory name prefixes from #includes in the current dir

[Diego Biurrun]

ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Tue Sep 10 08:30:54 2013 +0200| [a0b901a348e435f0234440736670fc9e8fcca836] | committer: Diego Biurrun

Drop pointless directory name prefixes from #includes in the current dir

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a0b901a348e435f0234440736670fc9e8fcca836
---

 libavcodec/avcodec.h  |    3 ++-
 libavcodec/s3tc.c     |    2 +-
 libavutil/blowfish.c  |    3 +--
 libavutil/des.c       |    4 +++-
 libavutil/float_dsp.c |    2 +-
 libavutil/pixfmt.h    |    2 +-
 libavutil/time.c      |    2 +-
 libavutil/xtea.c      |    3 +--
 libswscale/rgb2rgb.h  |    2 +-
 9 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index caf8284..2a39b43 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -39,7 +39,8 @@
 #include "libavutil/pixfmt.h"
 #include "libavutil/rational.h"
 
-#include "libavcodec/version.h"
+#include "version.h"
+
 /**
  * @defgroup libavc Encoding/Decoding Library
  * @{
diff --git a/libavcodec/s3tc.c b/libavcodec/s3tc.c
index 62dc356..d35cf2a 100644
--- a/libavcodec/s3tc.c
+++ b/libavcodec/s3tc.c
@@ -21,8 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "libavcodec/bytestream.h"
 #include "avcodec.h"
+#include "bytestream.h"
 #include "s3tc.h"
 
 static inline void dxt1_decode_pixels(GetByteContext *gb, uint32_t *d,
diff --git a/libavutil/blowfish.c b/libavutil/blowfish.c
index 63cc404..8437dd6 100644
--- a/libavutil/blowfish.c
+++ b/libavutil/blowfish.c
@@ -21,10 +21,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "libavutil/intreadwrite.h"
-
 #include "avutil.h"
 #include "common.h"
+#include "intreadwrite.h"
 #include "blowfish.h"
 
 static const uint32_t orig_p[AV_BF_ROUNDS + 2] = {
diff --git a/libavutil/des.c b/libavutil/des.c
index 01cb10b..ab0fc2f 100644
--- a/libavutil/des.c
+++ b/libavutil/des.c
@@ -339,7 +339,9 @@ void av_des_mac(AVDES *d, uint8_t *dst, const uint8_t *src, int count) {
 #ifdef TEST
 #include <stdlib.h>
 #include <stdio.h>
-#include "libavutil/time.h"
+
+#include "time.h"
+
 static uint64_t rand64(void) {
     uint64_t r = rand();
     r = (r << 32) | rand();
diff --git a/libavutil/float_dsp.c b/libavutil/float_dsp.c
index 3eda27a..3707e06 100644
--- a/libavutil/float_dsp.c
+++ b/libavutil/float_dsp.c
@@ -17,7 +17,7 @@
  */
 
 #include "config.h"
-#include "libavutil/attributes.h"
+#include "attributes.h"
 #include "float_dsp.h"
 
 static void vector_fmul_c(float *dst, const float *src0, const float *src1,
diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h
index 77305ca..4b04944 100644
--- a/libavutil/pixfmt.h
+++ b/libavutil/pixfmt.h
@@ -28,7 +28,7 @@
  */
 
 #include "libavutil/avconfig.h"
-#include "libavutil/version.h"
+#include "version.h"
 
 /**
  * Pixel format.
diff --git a/libavutil/time.c b/libavutil/time.c
index 51779c5..62cd445 100644
--- a/libavutil/time.c
+++ b/libavutil/time.c
@@ -31,7 +31,7 @@
 #include <windows.h>
 #endif
 
-#include "libavutil/time.h"
+#include "time.h"
 #include "error.h"
 
 int64_t av_gettime(void)
diff --git a/libavutil/xtea.c b/libavutil/xtea.c
index 1187662..d1efebf 100644
--- a/libavutil/xtea.c
+++ b/libavutil/xtea.c
@@ -21,10 +21,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "libavutil/intreadwrite.h"
-
 #include "avutil.h"
 #include "common.h"
+#include "intreadwrite.h"
 #include "xtea.h"
 
 void av_xtea_init(AVXTEA *ctx, const uint8_t key[16])
diff --git a/libswscale/rgb2rgb.h b/libswscale/rgb2rgb.h
index 42f468f..79c378d 100644
--- a/libswscale/rgb2rgb.h
+++ b/libswscale/rgb2rgb.h
@@ -28,8 +28,8 @@
 
 #include <inttypes.h>
 
-#include "libswscale/swscale.h"
 #include "libavutil/avutil.h"
+#include "swscale.h"
 
 /* A full collection of RGB to RGB(BGR) converters */
 extern void (*rgb24tobgr32)(const uint8_t *src, uint8_t *dst, int src_size);