diff options
author | Diego Biurrun <diego@biurrun.de> | 2011-06-05 01:28:22 +0200 |
---|---|---|
committer | Diego Biurrun <diego@biurrun.de> | 2011-06-07 10:31:26 +0200 |
commit | dc25d79f4980fb547908f4dd43732ebc0622610c (patch) | |
tree | 91694594d20104d3425db813f6f70cf9b61ca6a2 | |
parent | b9c6c7cb25932b594fd684a0cb553e439d49fe12 (diff) | |
download | ffmpeg-dc25d79f4980fb547908f4dd43732ebc0622610c.tar.gz |
Drop unnecessary directory prefixes from #include directives.
-rw-r--r-- | libavcodec/aac_tablegen.h | 2 | ||||
-rw-r--r-- | libavcodec/dnxhdenc.h | 5 | ||||
-rw-r--r-- | libavcodec/mlpdsp.c | 2 | ||||
-rw-r--r-- | libavcodec/v210enc.c | 2 | ||||
-rw-r--r-- | libavformat/mmsh.c | 2 | ||||
-rw-r--r-- | libavutil/audioconvert.c | 4 | ||||
-rw-r--r-- | libavutil/eval.c | 2 | ||||
-rw-r--r-- | libavutil/imgutils.c | 2 | ||||
-rw-r--r-- | libavutil/imgutils.h | 2 | ||||
-rw-r--r-- | libavutil/parseutils.c | 9 | ||||
-rw-r--r-- | libavutil/parseutils.h | 2 |
11 files changed, 18 insertions, 16 deletions
diff --git a/libavcodec/aac_tablegen.h b/libavcodec/aac_tablegen.h index 4486e1a9fc..8773d9b975 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 43f65e46dd..bb24540a9f 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 0053df88d8..7d01c7586d 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 dcaaac0dc5..8b022fa8f8 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 203691e2fc..b19973ea76 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 f789c77e20..fa27f0168b 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 a6a59a39ef..a3788210e3 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 544007f120..46853cafcb 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 7abeb657fb..b569eb1ca4 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 cc901314d9..0272c3ef67 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 c0f9aec392..befbbb56a1 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 |