Browse Source

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

tags/n2.1
Diego Biurrun 12 years ago
parent
commit
a0b901a348
9 changed files with 12 additions and 11 deletions
  1. +2
    -1
      libavcodec/avcodec.h
  2. +1
    -1
      libavcodec/s3tc.c
  3. +1
    -2
      libavutil/blowfish.c
  4. +3
    -1
      libavutil/des.c
  5. +1
    -1
      libavutil/float_dsp.c
  6. +1
    -1
      libavutil/pixfmt.h
  7. +1
    -1
      libavutil/time.c
  8. +1
    -2
      libavutil/xtea.c
  9. +1
    -1
      libswscale/rgb2rgb.h

+ 2
- 1
libavcodec/avcodec.h View File

@@ -39,7 +39,8 @@
#include "libavutil/pixfmt.h" #include "libavutil/pixfmt.h"
#include "libavutil/rational.h" #include "libavutil/rational.h"


#include "libavcodec/version.h"
#include "version.h"

/** /**
* @defgroup libavc Encoding/Decoding Library * @defgroup libavc Encoding/Decoding Library
* @{ * @{


+ 1
- 1
libavcodec/s3tc.c View File

@@ -21,8 +21,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */


#include "libavcodec/bytestream.h"
#include "avcodec.h" #include "avcodec.h"
#include "bytestream.h"
#include "s3tc.h" #include "s3tc.h"


static inline void dxt1_decode_pixels(GetByteContext *gb, uint32_t *d, static inline void dxt1_decode_pixels(GetByteContext *gb, uint32_t *d,


+ 1
- 2
libavutil/blowfish.c View File

@@ -21,10 +21,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */


#include "libavutil/intreadwrite.h"

#include "avutil.h" #include "avutil.h"
#include "common.h" #include "common.h"
#include "intreadwrite.h"
#include "blowfish.h" #include "blowfish.h"


static const uint32_t orig_p[AV_BF_ROUNDS + 2] = { static const uint32_t orig_p[AV_BF_ROUNDS + 2] = {


+ 3
- 1
libavutil/des.c View File

@@ -339,7 +339,9 @@ void av_des_mac(AVDES *d, uint8_t *dst, const uint8_t *src, int count) {
#ifdef TEST #ifdef TEST
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include "libavutil/time.h"

#include "time.h"

static uint64_t rand64(void) { static uint64_t rand64(void) {
uint64_t r = rand(); uint64_t r = rand();
r = (r << 32) | rand(); r = (r << 32) | rand();


+ 1
- 1
libavutil/float_dsp.c View File

@@ -17,7 +17,7 @@
*/ */


#include "config.h" #include "config.h"
#include "libavutil/attributes.h"
#include "attributes.h"
#include "float_dsp.h" #include "float_dsp.h"


static void vector_fmul_c(float *dst, const float *src0, const float *src1, static void vector_fmul_c(float *dst, const float *src0, const float *src1,


+ 1
- 1
libavutil/pixfmt.h View File

@@ -28,7 +28,7 @@
*/ */


#include "libavutil/avconfig.h" #include "libavutil/avconfig.h"
#include "libavutil/version.h"
#include "version.h"


/** /**
* Pixel format. * Pixel format.


+ 1
- 1
libavutil/time.c View File

@@ -31,7 +31,7 @@
#include <windows.h> #include <windows.h>
#endif #endif


#include "libavutil/time.h"
#include "time.h"
#include "error.h" #include "error.h"


int64_t av_gettime(void) int64_t av_gettime(void)


+ 1
- 2
libavutil/xtea.c View File

@@ -21,10 +21,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */


#include "libavutil/intreadwrite.h"

#include "avutil.h" #include "avutil.h"
#include "common.h" #include "common.h"
#include "intreadwrite.h"
#include "xtea.h" #include "xtea.h"


void av_xtea_init(AVXTEA *ctx, const uint8_t key[16]) void av_xtea_init(AVXTEA *ctx, const uint8_t key[16])


+ 1
- 1
libswscale/rgb2rgb.h View File

@@ -28,8 +28,8 @@


#include <inttypes.h> #include <inttypes.h>


#include "libswscale/swscale.h"
#include "libavutil/avutil.h" #include "libavutil/avutil.h"
#include "swscale.h"


/* A full collection of RGB to RGB(BGR) converters */ /* A full collection of RGB to RGB(BGR) converters */
extern void (*rgb24tobgr32)(const uint8_t *src, uint8_t *dst, int src_size); extern void (*rgb24tobgr32)(const uint8_t *src, uint8_t *dst, int src_size);


Loading…
Cancel
Save