---
libavcodec/aac_tablegen.h | 4 ++--
libavcodec/aacps_tablegen.h | 2 +-
libavcodec/cbrt_tablegen.h | 2 +-
libavcodec/dnxhdenc.h | 5 +++--
libavcodec/dv_tablegen.h | 2 +-
libavcodec/mlpdsp.c | 2 +-
libavcodec/motionpixels_tablegen.h | 2 +-
libavcodec/mpegaudio_tablegen.h | 2 +-
libavcodec/pcm_tablegen.h | 2 +-
libavcodec/qdm2_tablegen.h | 2 +-
libavcodec/sinewin_tablegen.h | 2 +-
libavcodec/v210enc.c | 2 +-
libavformat/mmsh.c | 2 +-
libavutil/audioconvert.c | 4 ++--
libavutil/bswap.h | 3 ++-
libavutil/common.h | 3 ++-
libavutil/eval.c | 2 +-
libavutil/imgutils.c | 2 +-
libavutil/imgutils.h | 2 +-
libavutil/intreadwrite.h | 3 ++-
libavutil/inverse.c | 2 +-
libavutil/parseutils.c | 9 +++++----
libavutil/parseutils.h | 2 +-
libavutil/pixfmt.h | 2 +-
24 files changed, 35 insertions(+), 30 deletions(-)
diff --git a/libavcodec/aac_tablegen.h b/libavcodec/aac_tablegen.h
index 4486e1a..ab1bdb3 100644
--- a/libavcodec/aac_tablegen.h
+++ b/libavcodec/aac_tablegen.h
@@ -26,10 +26,10 @@
#include "aac_tablegen_decl.h"
#if CONFIG_HARDCODED_TABLES
-#include "libavcodec/aac_tables.h"
+#include "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/aacps_tablegen.h b/libavcodec/aacps_tablegen.h
index 492cb0c..b86e3e1 100644
--- a/libavcodec/aacps_tablegen.h
+++ b/libavcodec/aacps_tablegen.h
@@ -27,7 +27,7 @@
#if CONFIG_HARDCODED_TABLES
#define ps_tableinit()
-#include "libavcodec/aacps_tables.h"
+#include "aacps_tables.h"
#else
#include "libavutil/common.h"
#include "libavutil/mathematics.h"
diff --git a/libavcodec/cbrt_tablegen.h b/libavcodec/cbrt_tablegen.h
index 01963a3..0b6beec 100644
--- a/libavcodec/cbrt_tablegen.h
+++ b/libavcodec/cbrt_tablegen.h
@@ -28,7 +28,7 @@
#if CONFIG_HARDCODED_TABLES
#define cbrt_tableinit()
-#include "libavcodec/cbrt_tables.h"
+#include "cbrt_tables.h"
#else
static uint32_t cbrt_tab[1 << 13];
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/dv_tablegen.h b/libavcodec/dv_tablegen.h
index 4fa8d91..01516e8 100644
--- a/libavcodec/dv_tablegen.h
+++ b/libavcodec/dv_tablegen.h
@@ -42,7 +42,7 @@ typedef struct dv_vlc_pair {
#if CONFIG_HARDCODED_TABLES
#define dv_vlc_map_tableinit()
-#include "libavcodec/dv_tables.h"
+#include "dv_tables.h"
#else
static struct dv_vlc_pair dv_vlc_map[DV_VLC_MAP_RUN_SIZE][DV_VLC_MAP_LEV_SIZE];
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/motionpixels_tablegen.h
b/libavcodec/motionpixels_tablegen.h
index cbf56c8..4d38a6d 100644
--- a/libavcodec/motionpixels_tablegen.h
+++ b/libavcodec/motionpixels_tablegen.h
@@ -45,7 +45,7 @@ static int mp_yuv_to_rgb(int y, int v, int u, int clip_rgb) {
#if CONFIG_HARDCODED_TABLES
#define motionpixels_tableinit()
-#include "libavcodec/motionpixels_tables.h"
+#include "motionpixels_tables.h"
#else
static YuvPixel mp_rgb_yuv_table[1 << 15];
diff --git a/libavcodec/mpegaudio_tablegen.h b/libavcodec/mpegaudio_tablegen.h
index a222f2c..372286e 100644
--- a/libavcodec/mpegaudio_tablegen.h
+++ b/libavcodec/mpegaudio_tablegen.h
@@ -29,7 +29,7 @@
#define TABLE_4_3_SIZE (8191 + 16)*4
#if CONFIG_HARDCODED_TABLES
#define mpegaudio_tableinit()
-#include "libavcodec/mpegaudio_tables.h"
+#include "mpegaudio_tables.h"
#else
static int8_t table_4_3_exp[TABLE_4_3_SIZE];
static uint32_t table_4_3_value[TABLE_4_3_SIZE];
diff --git a/libavcodec/pcm_tablegen.h b/libavcodec/pcm_tablegen.h
index 79d6561..581c2e0 100644
--- a/libavcodec/pcm_tablegen.h
+++ b/libavcodec/pcm_tablegen.h
@@ -75,7 +75,7 @@ static av_cold int ulaw2linear(unsigned char u_val)
#if CONFIG_HARDCODED_TABLES
#define pcm_alaw_tableinit()
#define pcm_ulaw_tableinit()
-#include "libavcodec/pcm_tables.h"
+#include "pcm_tables.h"
#else
/* 16384 entries per table */
static uint8_t linear_to_alaw[16384];
diff --git a/libavcodec/qdm2_tablegen.h b/libavcodec/qdm2_tablegen.h
index b2bb294..17c5b25 100644
--- a/libavcodec/qdm2_tablegen.h
+++ b/libavcodec/qdm2_tablegen.h
@@ -34,7 +34,7 @@
#define softclip_table_init()
#define rnd_table_init()
#define init_noise_samples()
-#include "libavcodec/qdm2_tables.h"
+#include "qdm2_tables.h"
#else
static uint16_t softclip_table[HARDCLIP_THRESHOLD - SOFTCLIP_THRESHOLD + 1];
static float noise_table[4096];
diff --git a/libavcodec/sinewin_tablegen.h b/libavcodec/sinewin_tablegen.h
index 720f1ab..4a0ef03 100644
--- a/libavcodec/sinewin_tablegen.h
+++ b/libavcodec/sinewin_tablegen.h
@@ -39,7 +39,7 @@ SINETABLE(1024);
SINETABLE(2048);
SINETABLE(4096);
#else
-#include "libavcodec/sinewin_tables.h"
+#include "sinewin_tables.h"
#endif
SINETABLE_CONST float * const ff_sine_windows[] = {
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/bswap.h b/libavutil/bswap.h
index 3657ccd..f800b0c 100644
--- a/libavutil/bswap.h
+++ b/libavutil/bswap.h
@@ -27,8 +27,9 @@
#define AVUTIL_BSWAP_H
#include <stdint.h>
-#include "libavutil/avconfig.h"
+
#include "attributes.h"
+#include "avconfig.h"
#ifdef HAVE_AV_CONFIG_H
diff --git a/libavutil/common.h b/libavutil/common.h
index a985fa4..b4069f8 100644
--- a/libavutil/common.h
+++ b/libavutil/common.h
@@ -34,8 +34,9 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+
#include "attributes.h"
-#include "libavutil/avconfig.h"
+#include "avconfig.h"
#if AV_HAVE_BIGENDIAN
# define AV_NE(be, le) (be)
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/intreadwrite.h b/libavutil/intreadwrite.h
index c8489f1..89a1f9f 100644
--- a/libavutil/intreadwrite.h
+++ b/libavutil/intreadwrite.h
@@ -20,8 +20,9 @@
#define AVUTIL_INTREADWRITE_H
#include <stdint.h>
-#include "libavutil/avconfig.h"
+
#include "attributes.h"
+#include "avconfig.h"
#include "bswap.h"
typedef union {
diff --git a/libavutil/inverse.c b/libavutil/inverse.c
index bca6183..5a5c490 100644
--- a/libavutil/inverse.c
+++ b/libavutil/inverse.c
@@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "libavutil/intmath.h"
+#include <stdint.h>
/* a*inverse[b]>>32 == a/b for all 0<=a<=16909558 && 2<=b<=256
* for a>16909558, is an overestimate by less than 1 part in 1<<24 */
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
diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h
index d88775f..f12de15 100644
--- a/libavutil/pixfmt.h
+++ b/libavutil/pixfmt.h
@@ -29,7 +29,7 @@
* header, so it should not be directly included in your projects.
*/
-#include "libavutil/avconfig.h"
+#include "avconfig.h"
/**
* Pixel format. Notes:
--
1.7.1
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
