diff options
| -rw-r--r-- | libavcodec/avcodec.h | 3 | ||||
| -rw-r--r-- | libavcodec/s3tc.c | 2 | ||||
| -rw-r--r-- | libavutil/blowfish.c | 3 | ||||
| -rw-r--r-- | libavutil/des.c | 4 | ||||
| -rw-r--r-- | libavutil/float_dsp.c | 2 | ||||
| -rw-r--r-- | libavutil/pixfmt.h | 2 | ||||
| -rw-r--r-- | libavutil/time.c | 2 | ||||
| -rw-r--r-- | libavutil/xtea.c | 3 | ||||
| -rw-r--r-- | libswscale/rgb2rgb.h | 2 |
9 files changed, 12 insertions, 11 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index caf828496d..2a39b433c3 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 62dc356792..d35cf2ac07 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 63cc4043ff..8437dd6f94 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 01cb10b359..ab0fc2f8bc 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 3eda27a3c3..3707e06694 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 77305cacdc..4b0494490d 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 51779c5d17..62cd445dbc 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 1187662eb2..d1efebf590 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 42f468fe21..79c378da75 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); |