[FFmpeg-cvslog] Drop unnecessary directory prefixes from #include directives.

Diego Biurrun git at videolan.org
Wed Jun 8 05:31:29 CEST 2011


ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Sun Jun  5 01:28:22 2011 +0200| [dc25d79f4980fb547908f4dd43732ebc0622610c] | committer: Diego Biurrun

Drop unnecessary directory prefixes from #include directives.

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

 libavcodec/aac_tablegen.h |    2 +-
 libavcodec/dnxhdenc.h     |    5 +++--
 libavcodec/mlpdsp.c       |    2 +-
 libavcodec/v210enc.c      |    2 +-
 libavformat/mmsh.c        |    2 +-
 libavutil/audioconvert.c  |    4 ++--
 libavutil/eval.c          |    2 +-
 libavutil/imgutils.c      |    2 +-
 libavutil/imgutils.h      |    2 +-
 libavutil/parseutils.c    |    9 +++++----
 libavutil/parseutils.h    |    2 +-
 11 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/libavcodec/aac_tablegen.h b/libavcodec/aac_tablegen.h
index 4486e1a..8773d9b 100644
--- a/libavcodec/aac_tablegen.h
+++ b/libavcodec/aac_tablegen.h
@@ -29,7 +29,7 @@
 #include "libavcodec/aac_tables.h"
 #else
 #include "libavutil/mathematics.h"
-#include "libavcodec/aac.h"
+#include "aac.h"
 float ff_aac_pow2sf_tab[428];
 
 void ff_aac_tableinit(void)
diff --git a/libavcodec/dnxhdenc.h b/libavcodec/dnxhdenc.h
index 43f65e4..bb24540 100644
--- a/libavcodec/dnxhdenc.h
+++ b/libavcodec/dnxhdenc.h
@@ -25,8 +25,9 @@
 #define AVCODEC_DNXHDENC_H
 
 #include <stdint.h>
-#include "libavcodec/mpegvideo.h"
-#include "libavcodec/dnxhddata.h"
+
+#include "mpegvideo.h"
+#include "dnxhddata.h"
 
 typedef struct {
     uint16_t mb;
diff --git a/libavcodec/mlpdsp.c b/libavcodec/mlpdsp.c
index 0053df8..7d01c75 100644
--- a/libavcodec/mlpdsp.c
+++ b/libavcodec/mlpdsp.c
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "libavcodec/mlp.h"
 #include "dsputil.h"
+#include "mlp.h"
 
 static void ff_mlp_filter_channel(int32_t *state, const int32_t *coeff,
                                   int firorder, int iirorder,
diff --git a/libavcodec/v210enc.c b/libavcodec/v210enc.c
index dcaaac0..8b022fa 100644
--- a/libavcodec/v210enc.c
+++ b/libavcodec/v210enc.c
@@ -22,7 +22,7 @@
  */
 
 #include "avcodec.h"
-#include "libavcodec/bytestream.h"
+#include "bytestream.h"
 
 static av_cold int encode_init(AVCodecContext *avctx)
 {
diff --git a/libavformat/mmsh.c b/libavformat/mmsh.c
index 203691e..b19973e 100644
--- a/libavformat/mmsh.c
+++ b/libavformat/mmsh.c
@@ -28,7 +28,7 @@
 #include <string.h>
 #include "libavutil/intreadwrite.h"
 #include "libavutil/avstring.h"
-#include "libavformat/internal.h"
+#include "internal.h"
 #include "mms.h"
 #include "asf.h"
 #include "http.h"
diff --git a/libavutil/audioconvert.c b/libavutil/audioconvert.c
index f789c77..fa27f01 100644
--- a/libavutil/audioconvert.c
+++ b/libavutil/audioconvert.c
@@ -23,8 +23,8 @@
  * audio conversion routines
  */
 
-#include "libavutil/avutil.h"
-#include "libavutil/avstring.h"
+#include "avstring.h"
+#include "avutil.h"
 #include "audioconvert.h"
 
 static const char * const channel_names[] = {
diff --git a/libavutil/eval.c b/libavutil/eval.c
index a6a59a3..a378821 100644
--- a/libavutil/eval.c
+++ b/libavutil/eval.c
@@ -26,7 +26,7 @@
  * see http://joe.hotchkiss.com/programming/eval/eval.html
  */
 
-#include "libavutil/avutil.h"
+#include "avutil.h"
 #include "eval.h"
 
 typedef struct Parser {
diff --git a/libavutil/imgutils.c b/libavutil/imgutils.c
index 544007f..46853ca 100644
--- a/libavutil/imgutils.c
+++ b/libavutil/imgutils.c
@@ -23,7 +23,7 @@
 
 #include "imgutils.h"
 #include "internal.h"
-#include "libavutil/pixdesc.h"
+#include "pixdesc.h"
 
 void av_image_fill_max_pixsteps(int max_pixsteps[4], int max_pixstep_comps[4],
                                 const AVPixFmtDescriptor *pixdesc)
diff --git a/libavutil/imgutils.h b/libavutil/imgutils.h
index 7abeb65..b569eb1 100644
--- a/libavutil/imgutils.h
+++ b/libavutil/imgutils.h
@@ -24,8 +24,8 @@
  * misc image utilities
  */
 
-#include "libavutil/pixdesc.h"
 #include "avutil.h"
+#include "pixdesc.h"
 
 /**
  * Compute the max pixel step for each plane of an image with a
diff --git a/libavutil/parseutils.c b/libavutil/parseutils.c
index cc90131..0272c3e 100644
--- a/libavutil/parseutils.c
+++ b/libavutil/parseutils.c
@@ -24,11 +24,12 @@
 #include <strings.h>
 #include <sys/time.h>
 #include <time.h>
+
+#include "avstring.h"
+#include "avutil.h"
+#include "eval.h"
+#include "random_seed.h"
 #include "parseutils.h"
-#include "libavutil/avutil.h"
-#include "libavutil/eval.h"
-#include "libavutil/avstring.h"
-#include "libavutil/random_seed.h"
 
 typedef struct {
     const char *abbr;
diff --git a/libavutil/parseutils.h b/libavutil/parseutils.h
index c0f9aec..befbbb5 100644
--- a/libavutil/parseutils.h
+++ b/libavutil/parseutils.h
@@ -19,7 +19,7 @@
 #ifndef AVUTIL_PARSEUTILS_H
 #define AVUTIL_PARSEUTILS_H
 
-#include "libavutil/rational.h"
+#include "rational.h"
 
 /**
  * @file



More information about the ffmpeg-cvslog mailing list