diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-11 12:50:55 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-11 12:51:01 +0200 |
| commit | 803445e02c773fc29040629abdc297534ab6c3f3 (patch) | |
| tree | f4af5e0b5e8527a7d6a280978d569502dd1e4d24 /libavutil | |
| parent | c45e9097d839e69ab74160386db5e9728deaaf62 (diff) | |
| parent | a0b901a348e435f0234440736670fc9e8fcca836 (diff) | |
| download | ffmpeg-803445e02c773fc29040629abdc297534ab6c3f3.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Drop pointless directory name prefixes from #includes in the current dir
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil')
| -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 |
6 files changed, 8 insertions, 8 deletions
diff --git a/libavutil/blowfish.c b/libavutil/blowfish.c index 5ad74c10fd..3821427570 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 a7a5074203..57ad0a4fff 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 64bd2e6437..efff47f89a 100644 --- a/libavutil/float_dsp.c +++ b/libavutil/float_dsp.c @@ -20,7 +20,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 8489a39770..4fc9c7fb7b 100644 --- a/libavutil/pixfmt.h +++ b/libavutil/pixfmt.h @@ -28,7 +28,7 @@ */ #include "libavutil/avconfig.h" -#include "libavutil/version.h" +#include "version.h" #define AVPALETTE_SIZE 1024 #define AVPALETTE_COUNT 256 diff --git a/libavutil/time.c b/libavutil/time.c index 27feb0b758..5a00e7025d 100644 --- a/libavutil/time.c +++ b/libavutil/time.c @@ -33,7 +33,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 5fbfd58efa..5bb4cf7bf5 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]) |