diff options
Diffstat (limited to 'libavcodec')
66 files changed, 116 insertions, 78 deletions
diff --git a/libavcodec/ac3.c b/libavcodec/ac3.c index a0fd00138f..e1d0f12073 100644 --- a/libavcodec/ac3.c +++ b/libavcodec/ac3.c @@ -24,7 +24,8 @@ * Common code between the AC-3 encoder and decoder. */ -#include "libavutil/common.h" +#include "libavutil/error.h" +#include "libavutil/macros.h" #include "ac3.h" diff --git a/libavcodec/ac3.h b/libavcodec/ac3.h index 0e52028111..dabd49f4cc 100644 --- a/libavcodec/ac3.h +++ b/libavcodec/ac3.h @@ -78,6 +78,7 @@ typedef int INTFLOAT; typedef int16_t SHORTFLOAT; #else /* USE_FIXED */ +#include "libavutil/libm.h" #define FIXR(x) ((float)(x)) #define FIXR12(x) ((float)(x)) diff --git a/libavcodec/ass_split.c b/libavcodec/ass_split.c index 05c5453e53..73ef6196c5 100644 --- a/libavcodec/ass_split.c +++ b/libavcodec/ass_split.c @@ -19,8 +19,14 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavutil/common.h" +#include <limits.h> +#include <stddef.h> +#include <stdint.h> +#include <stdio.h> +#include <string.h> + #include "libavutil/error.h" +#include "libavutil/macros.h" #include "libavutil/mem.h" #include "ass_split.h" diff --git a/libavcodec/av1_parse.h b/libavcodec/av1_parse.h index 3861d80b4c..f4a5d2830e 100644 --- a/libavcodec/av1_parse.h +++ b/libavcodec/av1_parse.h @@ -24,9 +24,9 @@ #include <limits.h> #include <stdint.h> -#include "libavutil/common.h" #include "libavutil/error.h" #include "libavutil/intmath.h" +#include "libavutil/macros.h" #include "av1.h" #include "get_bits.h" diff --git a/libavcodec/bitstream.c b/libavcodec/bitstream.c index 2dd0226614..c948c889b6 100644 --- a/libavcodec/bitstream.c +++ b/libavcodec/bitstream.c @@ -36,11 +36,11 @@ #include "config.h" #include "libavutil/avassert.h" #include "libavutil/bswap.h" -#include "libavutil/common.h" #include "libavutil/error.h" #include "libavutil/internal.h" #include "libavutil/intreadwrite.h" #include "libavutil/log.h" +#include "libavutil/macros.h" #include "libavutil/mem.h" #include "libavutil/qsort.h" #include "mathops.h" diff --git a/libavcodec/cabac.c b/libavcodec/cabac.c index 6649feebeb..7d41cd2ae6 100644 --- a/libavcodec/cabac.c +++ b/libavcodec/cabac.c @@ -24,13 +24,10 @@ * Context Adaptive Binary Arithmetic Coder. */ -#include <string.h> - -#include "libavutil/common.h" +#include "libavutil/error.h" #include "libavutil/mem_internal.h" #include "cabac.h" -#include "cabac_functions.h" DECLARE_ASM_ALIGNED(1, const uint8_t, ff_h264_cabac_tables)[512 + 4*2*64 + 4*64 + 63] = { 9,8,7,7,6,6,6,6,5,5,5,5,5,5,5,5, diff --git a/libavcodec/celp_math.c b/libavcodec/celp_math.c index 920995a879..f4bbd158ab 100644 --- a/libavcodec/celp_math.c +++ b/libavcodec/celp_math.c @@ -20,14 +20,13 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <inttypes.h> -#include <limits.h> +#include <stdint.h> +#include "config.h" #include "libavutil/avassert.h" -#include "avcodec.h" +#include "libavutil/intmath.h" #include "mathops.h" #include "celp_math.h" -#include "libavutil/common.h" #ifdef G729_BITEXACT static const uint16_t exp2a[]= diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index 0974ee03de..725c687b00 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -19,10 +19,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <stdlib.h> #include <string.h> -#include "libavutil/common.h" #include "libavutil/internal.h" +#include "libavutil/macros.h" #include "codec_id.h" #include "codec_desc.h" diff --git a/libavcodec/dca_exss.h b/libavcodec/dca_exss.h index 208fae1b85..9e91b00bfd 100644 --- a/libavcodec/dca_exss.h +++ b/libavcodec/dca_exss.h @@ -21,7 +21,7 @@ #ifndef AVCODEC_DCA_EXSS_H #define AVCODEC_DCA_EXSS_H -#include "libavutil/common.h" +#include <stdint.h> #include "avcodec.h" #include "get_bits.h" diff --git a/libavcodec/dcadct.c b/libavcodec/dcadct.c index 1082aa884d..a0eda3d2bb 100644 --- a/libavcodec/dcadct.c +++ b/libavcodec/dcadct.c @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavutil/common.h" +#include <stdlib.h> #include "dcadct.h" #include "dcamath.h" diff --git a/libavcodec/dcadct.h b/libavcodec/dcadct.h index 518c9f9032..2ef60c16db 100644 --- a/libavcodec/dcadct.h +++ b/libavcodec/dcadct.h @@ -21,7 +21,8 @@ #ifndef AVCODEC_DCADCT_H #define AVCODEC_DCADCT_H -#include "libavutil/common.h" +#include <stdint.h> +#include "libavutil/attributes.h" typedef struct DCADCTContext { void (*imdct_half[2])(int32_t *output, const int32_t *input); diff --git a/libavcodec/dcadec.h b/libavcodec/dcadec.h index 9da8d3b444..0f371eca14 100644 --- a/libavcodec/dcadec.h +++ b/libavcodec/dcadec.h @@ -21,9 +21,11 @@ #ifndef AVCODEC_DCADEC_H #define AVCODEC_DCADEC_H -#include "libavutil/common.h" +#include <stdint.h> + #include "libavutil/crc.h" #include "libavutil/float_dsp.h" +#include "libavutil/log.h" #include "avcodec.h" #include "get_bits.h" diff --git a/libavcodec/dcahuff.c b/libavcodec/dcahuff.c index fec60771ec..fa36735c0b 100644 --- a/libavcodec/dcahuff.c +++ b/libavcodec/dcahuff.c @@ -23,7 +23,7 @@ #include <stddef.h> #include "libavutil/avassert.h" -#include "libavutil/common.h" +#include "libavutil/macros.h" #include "dcahuff.h" #include "put_bits.h" diff --git a/libavcodec/dirac_vlc.h b/libavcodec/dirac_vlc.h index bfcfa136a1..5adb9ef631 100644 --- a/libavcodec/dirac_vlc.h +++ b/libavcodec/dirac_vlc.h @@ -19,7 +19,7 @@ #ifndef AVCODEC_DIRAC_VLC_H #define AVCODEC_DIRAC_VLC_H -#include "libavutil/avutil.h" +#include <stdint.h> int ff_dirac_golomb_read_16bit(const uint8_t *buf, int bytes, uint8_t *_dst, int coeffs); diff --git a/libavcodec/dnxhddata.c b/libavcodec/dnxhddata.c index cb3d4a4c72..d52abe87dd 100644 --- a/libavcodec/dnxhddata.c +++ b/libavcodec/dnxhddata.c @@ -19,9 +19,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <stddef.h> +#include "libavutil/log.h" +#include "libavutil/macros.h" #include "avcodec.h" #include "dnxhddata.h" -#include "libavutil/common.h" /* The quantization tables below are in zigzag order! */ diff --git a/libavcodec/dnxhddata.h b/libavcodec/dnxhddata.h index 861faca4ca..ea36feb0a2 100644 --- a/libavcodec/dnxhddata.h +++ b/libavcodec/dnxhddata.h @@ -24,8 +24,9 @@ #include <stdint.h> #include "avcodec.h" -#include "libavutil/internal.h" +#include "libavutil/attributes.h" #include "libavutil/intreadwrite.h" +#include "libavutil/rational.h" /** Additional profile info flags */ #define DNXHD_INTERLACED (1<<0) diff --git a/libavcodec/dv_profile.c b/libavcodec/dv_profile.c index 0fc227dd04..f403114184 100644 --- a/libavcodec/dv_profile.c +++ b/libavcodec/dv_profile.c @@ -18,11 +18,12 @@ #include "config.h" +#include <stddef.h> #include <stdint.h> -#include "libavutil/common.h" #include "libavutil/intreadwrite.h" #include "libavutil/log.h" +#include "libavutil/macros.h" #include "libavutil/pixdesc.h" #include "avcodec.h" diff --git a/libavcodec/elsdec.c b/libavcodec/elsdec.c index ecb5757066..9ae932cdf7 100644 --- a/libavcodec/elsdec.c +++ b/libavcodec/elsdec.c @@ -25,11 +25,14 @@ * Entropy Logarithmic-Scale binary arithmetic decoder */ -#include <math.h> +#include <stddef.h> #include <stdint.h> +#include <string.h> -#include "libavutil/common.h" +#include "libavutil/error.h" #include "libavutil/intreadwrite.h" +#include "libavutil/macros.h" +#include "libavutil/mem.h" #include "elsdec.h" diff --git a/libavcodec/exrdsp.h b/libavcodec/exrdsp.h index 2c4dc3af88..aba3d3cf51 100644 --- a/libavcodec/exrdsp.h +++ b/libavcodec/exrdsp.h @@ -19,8 +19,8 @@ #ifndef AVCODEC_EXRDSP_H #define AVCODEC_EXRDSP_H +#include <stddef.h> #include <stdint.h> -#include "libavutil/common.h" typedef struct ExrDSPContext { void (*reorder_pixels)(uint8_t *dst, const uint8_t *src, ptrdiff_t size); diff --git a/libavcodec/flacdsp.c b/libavcodec/flacdsp.c index bc9a5dbed9..6b6d578d64 100644 --- a/libavcodec/flacdsp.c +++ b/libavcodec/flacdsp.c @@ -19,6 +19,7 @@ */ #include "libavutil/attributes.h" +#include "libavutil/internal.h" #include "libavutil/samplefmt.h" #include "flacdsp.h" #include "config.h" diff --git a/libavcodec/flacdsp.h b/libavcodec/flacdsp.h index 7bb0dd0e9a..4a7a36064a 100644 --- a/libavcodec/flacdsp.h +++ b/libavcodec/flacdsp.h @@ -20,7 +20,7 @@ #define AVCODEC_FLACDSP_H #include <stdint.h> -#include "libavutil/internal.h" + #include "libavutil/samplefmt.h" typedef struct FLACDSPContext { diff --git a/libavcodec/flacdsp_lpc_template.c b/libavcodec/flacdsp_lpc_template.c index 5d532e0673..dd847d3b32 100644 --- a/libavcodec/flacdsp_lpc_template.c +++ b/libavcodec/flacdsp_lpc_template.c @@ -17,7 +17,7 @@ */ #include <stdint.h> -#include "libavutil/avutil.h" +#include "libavutil/common.h" #include "mathops.h" #undef FUNC diff --git a/libavcodec/flacdsp_template.c b/libavcodec/flacdsp_template.c index 892418cddc..0a6fe59e28 100644 --- a/libavcodec/flacdsp_template.c +++ b/libavcodec/flacdsp_template.c @@ -19,7 +19,7 @@ */ #include <stdint.h> -#include "libavutil/avutil.h" +#include "libavutil/macros.h" #undef FUNC #undef FSUF diff --git a/libavcodec/fmtconvert.c b/libavcodec/fmtconvert.c index 3b33af61ef..3e1f133bf1 100644 --- a/libavcodec/fmtconvert.c +++ b/libavcodec/fmtconvert.c @@ -20,9 +20,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" +#include "libavutil/attributes.h" #include "avcodec.h" #include "fmtconvert.h" -#include "libavutil/common.h" static void int32_to_float_fmul_scalar_c(float *dst, const int32_t *src, float mul, int len) diff --git a/libavcodec/golomb.c b/libavcodec/golomb.c index 937ac22ce1..f9ca8149eb 100644 --- a/libavcodec/golomb.c +++ b/libavcodec/golomb.c @@ -26,7 +26,7 @@ * @author Michael Niedermayer <michaelni@gmx.at> */ -#include "libavutil/common.h" +#include <stdint.h> const uint8_t ff_golomb_vlc_len[512]={ 19,17,15,15,13,13,13,13,11,11,11,11,11,11,11,11,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, diff --git a/libavcodec/h264_levels.c b/libavcodec/h264_levels.c index 1b9f78da04..f7ed9a6e37 100644 --- a/libavcodec/h264_levels.c +++ b/libavcodec/h264_levels.c @@ -17,7 +17,7 @@ */ #include <stddef.h> -#include "libavutil/common.h" +#include "libavutil/macros.h" #include "h264_levels.h" // H.264 table A-1. diff --git a/libavcodec/h264_redundant_pps_bsf.c b/libavcodec/h264_redundant_pps_bsf.c index 769946abfd..d64b064590 100644 --- a/libavcodec/h264_redundant_pps_bsf.c +++ b/libavcodec/h264_redundant_pps_bsf.c @@ -16,16 +16,17 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <string.h> +#include <inttypes.h> -#include "libavutil/common.h" +#include "libavutil/log.h" #include "bsf.h" -#include "bsf_internal.h" #include "cbs.h" #include "cbs_bsf.h" #include "cbs_h264.h" +#include "codec_id.h" #include "h264.h" +#include "packet.h" #define NEW_GLOBAL_PIC_INIT_QP 26 diff --git a/libavcodec/h264_sei.c b/libavcodec/h264_sei.c index 329c2ea4f2..034ddb8f1c 100644 --- a/libavcodec/h264_sei.c +++ b/libavcodec/h264_sei.c @@ -28,9 +28,9 @@ #include <limits.h> #include <stdio.h> #include <string.h> -#include "libavutil/common.h" #include "libavutil/error.h" #include "libavutil/log.h" +#include "libavutil/macros.h" #include "libavutil/mem.h" #include "atsc_a53.h" #include "get_bits.h" diff --git a/libavcodec/huffman.c b/libavcodec/huffman.c index be351ba2d6..99aa39c565 100644 --- a/libavcodec/huffman.c +++ b/libavcodec/huffman.c @@ -26,8 +26,11 @@ #include <stdint.h> +#include "libavutil/error.h" +#include "libavutil/log.h" +#include "libavutil/macros.h" +#include "libavutil/mem.h" #include "libavutil/qsort.h" -#include "libavutil/common.h" #include "huffman.h" #include "vlc.h" diff --git a/libavcodec/jfdctfst.c b/libavcodec/jfdctfst.c index bbcf598490..805e05808c 100644 --- a/libavcodec/jfdctfst.c +++ b/libavcodec/jfdctfst.c @@ -66,9 +66,8 @@ * Independent JPEG Group's fast AAN dct. */ -#include <stdlib.h> -#include <stdio.h> -#include "libavutil/common.h" +#include <stdint.h> +#include "libavutil/attributes.h" #include "dct.h" #define DCTSIZE 8 diff --git a/libavcodec/jpeg2000dwt.c b/libavcodec/jpeg2000dwt.c index ed24091fe8..f2da7307c4 100644 --- a/libavcodec/jpeg2000dwt.c +++ b/libavcodec/jpeg2000dwt.c @@ -25,7 +25,8 @@ * Discrete wavelet transform */ -#include "libavutil/common.h" +#include "libavutil/error.h" +#include "libavutil/macros.h" #include "libavutil/mem.h" #include "jpeg2000dwt.h" diff --git a/libavcodec/jrevdct.c b/libavcodec/jrevdct.c index a1a0f571ad..36160cb663 100644 --- a/libavcodec/jrevdct.c +++ b/libavcodec/jrevdct.c @@ -62,7 +62,9 @@ * Independent JPEG Group's LLM idct. */ -#include "libavutil/common.h" +#include <stddef.h> +#include <stdint.h> + #include "libavutil/intreadwrite.h" #include "dct.h" diff --git a/libavcodec/lagarithrac.h b/libavcodec/lagarithrac.h index ee836d01db..a31b054dbb 100644 --- a/libavcodec/lagarithrac.h +++ b/libavcodec/lagarithrac.h @@ -31,7 +31,6 @@ #define AVCODEC_LAGARITHRAC_H #include <stdint.h> -#include "libavutil/common.h" #include "libavutil/intreadwrite.h" #include "avcodec.h" #include "get_bits.h" diff --git a/libavcodec/libopus.c b/libavcodec/libopus.c index 16395c73df..3d3b740a83 100644 --- a/libavcodec/libopus.c +++ b/libavcodec/libopus.c @@ -21,7 +21,6 @@ #include <opus_defines.h> -#include "libavutil/common.h" #include "libavutil/error.h" #include "libopus.h" diff --git a/libavcodec/lsp.c b/libavcodec/lsp.c index 29055fd478..90f2efaafe 100644 --- a/libavcodec/lsp.c +++ b/libavcodec/lsp.c @@ -21,10 +21,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <inttypes.h> +#include <math.h> #define FRAC_BITS 14 -#include "libavutil/common.h" +#include "libavutil/macros.h" #include "mathops.h" #include "lsp.h" #include "libavcodec/mips/lsp_mips.h" diff --git a/libavcodec/lzwenc.c b/libavcodec/lzwenc.c index bb8eb2e1dd..ae1816a03e 100644 --- a/libavcodec/lzwenc.c +++ b/libavcodec/lzwenc.c @@ -27,7 +27,7 @@ #include <stdint.h> #include "libavutil/avassert.h" -#include "libavutil/common.h" +#include "libavutil/macros.h" #include "lzw.h" #include "put_bits.h" diff --git a/libavcodec/mdct15.c b/libavcodec/mdct15.c index 6f35059bfe..3a735c77d4 100644 --- a/libavcodec/mdct15.c +++ b/libavcodec/mdct15.c @@ -27,11 +27,12 @@ #include <float.h> #include <math.h> #include <stddef.h> +#include <stdint.h> #include "config.h" #include "libavutil/attributes.h" -#include "libavutil/common.h" +#include "libavutil/error.h" #include "mdct15.h" diff --git a/libavcodec/mips/mpegaudiodsp_mips_fixed.c b/libavcodec/mips/mpegaudiodsp_mips_fixed.c index 1c9c68d23c..ef9750a44e 100644 --- a/libavcodec/mips/mpegaudiodsp_mips_fixed.c +++ b/libavcodec/mips/mpegaudiodsp_mips_fixed.c @@ -54,6 +54,7 @@ #include <string.h> +#include "config.h" #include "libavutil/mips/asmdefs.h" #include "libavcodec/mpegaudiodsp.h" diff --git a/libavcodec/mips/mpegaudiodsp_mips_float.c b/libavcodec/mips/mpegaudiodsp_mips_float.c index ae130c752e..53b77619c9 100644 --- a/libavcodec/mips/mpegaudiodsp_mips_float.c +++ b/libavcodec/mips/mpegaudiodsp_mips_float.c @@ -55,6 +55,7 @@ #include <string.h> +#include "config.h" #include "libavutil/mips/asmdefs.h" #include "libavcodec/mpegaudiodsp.h" diff --git a/libavcodec/mjpegenc_huffman.c b/libavcodec/mjpegenc_huffman.c index 0e63f8066b..9bfcb7e785 100644 --- a/libavcodec/mjpegenc_huffman.c +++ b/libavcodec/mjpegenc_huffman.c @@ -21,10 +21,7 @@ #include <string.h> #include <stdint.h> -#include <stdlib.h> #include "libavutil/avassert.h" -#include "libavutil/common.h" -#include "libavutil/error.h" #include "libavutil/qsort.h" #include "mjpegenc_huffman.h" diff --git a/libavcodec/mpegaudiodecheader.c b/libavcodec/mpegaudiodecheader.c index 446a6e29d8..ef63befbf4 100644 --- a/libavcodec/mpegaudiodecheader.c +++ b/libavcodec/mpegaudiodecheader.c @@ -24,7 +24,7 @@ * MPEG Audio header decoder. */ -#include "libavutil/common.h" +#include "libavutil/macros.h" #include "mpegaudio.h" #include "mpegaudiodata.h" diff --git a/libavcodec/mpegaudiodsp.h b/libavcodec/mpegaudiodsp.h index 4577d515d9..7bc635191a 100644 --- a/libavcodec/mpegaudiodsp.h +++ b/libavcodec/mpegaudiodsp.h @@ -22,7 +22,7 @@ #include <stddef.h> #include <stdint.h> -#include "libavutil/common.h" +#include "libavutil/macros.h" typedef struct MPADSPContext { void (*apply_window_float)(float *synth_buf, float *window, diff --git a/libavcodec/msmpeg4data.h b/libavcodec/msmpeg4data.h index 87b4057d97..ec7957c126 100644 --- a/libavcodec/msmpeg4data.h +++ b/libavcodec/msmpeg4data.h @@ -30,7 +30,7 @@ #ifndef AVCODEC_MSMPEG4DATA_H #define AVCODEC_MSMPEG4DATA_H -#include "libavutil/common.h" +#include <stdint.h> #include "rl.h" #include "vlc.h" diff --git a/libavcodec/opusdsp.c b/libavcodec/opusdsp.c index 08df87ffbe..2c46afa839 100644 --- a/libavcodec/opusdsp.c +++ b/libavcodec/opusdsp.c @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" +#include "libavutil/attributes.h" #include "opusdsp.h" static void postfilter_c(float *data, int period, float *gains, int len) diff --git a/libavcodec/opusdsp.h b/libavcodec/opusdsp.h index ee3186dd44..3ea3d14bf0 100644 --- a/libavcodec/opusdsp.h +++ b/libavcodec/opusdsp.h @@ -19,8 +19,6 @@ #ifndef AVCODEC_OPUSDSP_H #define AVCODEC_OPUSDSP_H -#include "libavutil/common.h" - #define CELT_EMPH_COEFF 0.8500061035f typedef struct OpusDSP { diff --git a/libavcodec/pngdsp.c b/libavcodec/pngdsp.c index d2753163da..f450a4c5ee 100644 --- a/libavcodec/pngdsp.c +++ b/libavcodec/pngdsp.c @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" #include "libavutil/attributes.h" -#include "libavutil/common.h" #include "png.h" #include "pngdsp.h" diff --git a/libavcodec/ra288.h b/libavcodec/ra288.h index 96b074bffb..e7b12c5fa6 100644 --- a/libavcodec/ra288.h +++ b/libavcodec/ra288.h @@ -23,7 +23,7 @@ #define AVCODEC_RA288_H #include <stdint.h> -#include "libavutil/common.h" +#include "libavutil/macros.h" #include "libavutil/mem_internal.h" static const float amptable[8]={ diff --git a/libavcodec/rangecoder.h b/libavcodec/rangecoder.h index 4495f6df1a..89d178ac31 100644 --- a/libavcodec/rangecoder.h +++ b/libavcodec/rangecoder.h @@ -29,8 +29,8 @@ #include <stdint.h> -#include "libavutil/common.h" #include "libavutil/avassert.h" +#include "libavutil/intmath.h" typedef struct RangeCoder { int low; diff --git a/libavcodec/raw.c b/libavcodec/raw.c index 5efc1eb465..a371bb36c4 100644 --- a/libavcodec/raw.c +++ b/libavcodec/raw.c @@ -24,9 +24,9 @@ * Raw Video Codec */ +#include "libavutil/macros.h" #include "avcodec.h" #include "raw.h" -#include "libavutil/common.h" static const PixelFormatTag raw_pix_fmt_tags[] = { { AV_PIX_FMT_YUV420P, MKTAG('I', '4', '2', '0') }, /* Planar formats */ diff --git a/libavcodec/rle.c b/libavcodec/rle.c index 1ef6077a6b..cebd238264 100644 --- a/libavcodec/rle.c +++ b/libavcodec/rle.c @@ -21,7 +21,7 @@ #include <string.h> -#include "libavutil/common.h" +#include "libavutil/macros.h" #include "rle.h" diff --git a/libavcodec/scpr3.h b/libavcodec/scpr3.h index 92ad968882..8988300ce0 100644 --- a/libavcodec/scpr3.h +++ b/libavcodec/scpr3.h @@ -23,12 +23,7 @@ #ifndef AVCODEC_SCPR3_H #define AVCODEC_SCPR3_H -#include <stdio.h> -#include <stdlib.h> -#include <string.h> - -#include "avcodec.h" -#include "internal.h" +#include <stdint.h> typedef struct PixelModel3 { uint8_t type; diff --git a/libavcodec/tests/cabac.c b/libavcodec/tests/cabac.c index b84a96ce81..d9f98c68e0 100644 --- a/libavcodec/tests/cabac.c +++ b/libavcodec/tests/cabac.c @@ -18,12 +18,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavcodec/cabac_functions.h" #include "libavcodec/cabac.c" #define SIZE 10240 #include "libavutil/lfg.h" -#include "libavcodec/avcodec.h" #include "libavcodec/put_bits.h" typedef struct CABACTestContext { diff --git a/libavcodec/tests/jpeg2000dwt.c b/libavcodec/tests/jpeg2000dwt.c index 80b33bee79..0e5a6ed947 100644 --- a/libavcodec/tests/jpeg2000dwt.c +++ b/libavcodec/tests/jpeg2000dwt.c @@ -20,6 +20,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <inttypes.h> +#include <stdio.h> + +#include "libavutil/common.h" + #include "libavcodec/jpeg2000dwt.c" #include "libavutil/lfg.h" diff --git a/libavcodec/tests/rangecoder.c b/libavcodec/tests/rangecoder.c index ca96e13c99..fd858535a5 100644 --- a/libavcodec/tests/rangecoder.c +++ b/libavcodec/tests/rangecoder.c @@ -19,6 +19,7 @@ #include <stdint.h> #include <string.h> +#include "libavutil/error.h" #include "libavutil/lfg.h" #include "libavutil/log.h" diff --git a/libavcodec/trace_headers_bsf.c b/libavcodec/trace_headers_bsf.c index a9b0247412..96a52fac53 100644 --- a/libavcodec/trace_headers_bsf.c +++ b/libavcodec/trace_headers_bsf.c @@ -16,10 +16,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <stdio.h> +#include <inttypes.h> #include "libavutil/avstring.h" -#include "libavutil/common.h" +#include "libavutil/avutil.h" #include "libavutil/log.h" #include "bsf.h" diff --git a/libavcodec/videodsp.c b/libavcodec/videodsp.c index 212147984f..2198d46c15 100644 --- a/libavcodec/videodsp.c +++ b/libavcodec/videodsp.c @@ -18,9 +18,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" #include "libavutil/attributes.h" #include "libavutil/avassert.h" -#include "libavutil/common.h" +#include "libavutil/macros.h" #include "videodsp.h" #define BIT_DEPTH 8 diff --git a/libavcodec/vp56data.h b/libavcodec/vp56data.h index 3be268c317..aaca1fd088 100644 --- a/libavcodec/vp56data.h +++ b/libavcodec/vp56data.h @@ -26,7 +26,7 @@ #ifndef AVCODEC_VP56DATA_H #define AVCODEC_VP56DATA_H -#include "libavutil/common.h" +#include <stdint.h> #include "vp56.h" extern const uint8_t ff_vp56_b2p[]; diff --git a/libavcodec/vp56rac.c b/libavcodec/vp56rac.c index 64fb6a99b4..19e7dcf2bb 100644 --- a/libavcodec/vp56rac.c +++ b/libavcodec/vp56rac.c @@ -19,7 +19,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavutil/common.h" +#include <stdint.h> +#include "libavutil/error.h" +#include "bytestream.h" #include "vp56.h" const uint8_t ff_vp56_norm_shift[256]= { diff --git a/libavcodec/vp9dsp.c b/libavcodec/vp9dsp.c index 82bfe394d1..3441419e2d 100644 --- a/libavcodec/vp9dsp.c +++ b/libavcodec/vp9dsp.c @@ -21,8 +21,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" + +#include "libavutil/attributes.h" #include "libavutil/avassert.h" -#include "libavutil/common.h" #include "libavutil/mem_internal.h" #include "vp9dsp.h" diff --git a/libavcodec/wavpack.h b/libavcodec/wavpack.h index 7e7dfce2b7..9f62f8406d 100644 --- a/libavcodec/wavpack.h +++ b/libavcodec/wavpack.h @@ -22,7 +22,10 @@ #ifndef AVCODEC_WAVPACK_H #define AVCODEC_WAVPACK_H -#include "libavutil/common.h" +#include <limits.h> +#include <stdint.h> +#include "libavutil/attributes.h" +#include "libavutil/intmath.h" #define MAX_TERMS 16 #define MAX_TERM 8 diff --git a/libavcodec/wavpackenc.h b/libavcodec/wavpackenc.h index 11914337cf..b6d12e8a5c 100644 --- a/libavcodec/wavpackenc.h +++ b/libavcodec/wavpackenc.h @@ -21,6 +21,8 @@ #ifndef AVCODEC_WAVPACKENC_H #define AVCODEC_WAVPACKENC_H +#include <stdint.h> +#include "libavutil/macros.h" #include "wavpack.h" typedef struct WavPackDecorrSpec { diff --git a/libavcodec/x86/fdct.c b/libavcodec/x86/fdct.c index 033ff1ccc5..835fcc2b28 100644 --- a/libavcodec/x86/fdct.c +++ b/libavcodec/x86/fdct.c @@ -30,8 +30,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" #include "libavutil/attributes.h" -#include "libavutil/common.h" +#include "libavutil/macros.h" #include "libavutil/mem_internal.h" #include "libavutil/x86/asm.h" #include "fdct.h" diff --git a/libavcodec/x86/mpegaudiodsp.c b/libavcodec/x86/mpegaudiodsp.c index 50692f29ce..dcea94a1f5 100644 --- a/libavcodec/x86/mpegaudiodsp.c +++ b/libavcodec/x86/mpegaudiodsp.c @@ -19,9 +19,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <stddef.h> + +#include "config.h" #include "libavutil/attributes.h" #include "libavutil/cpu.h" -#include "libavutil/internal.h" #include "libavutil/mem_internal.h" #include "libavutil/x86/asm.h" #include "libavutil/x86/cpu.h" diff --git a/libavcodec/x86/pngdsp_init.c b/libavcodec/x86/pngdsp_init.c index 7dca62c675..edbe866c22 100644 --- a/libavcodec/x86/pngdsp_init.c +++ b/libavcodec/x86/pngdsp_init.c @@ -19,8 +19,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <stdint.h> +#include "config.h" #include "libavutil/attributes.h" -#include "libavutil/common.h" #include "libavutil/x86/cpu.h" #include "libavcodec/pngdsp.h" diff --git a/libavcodec/xiph.c b/libavcodec/xiph.c index 3073315e63..218b0813e9 100644 --- a/libavcodec/xiph.c +++ b/libavcodec/xiph.c @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <limits.h> +#include "libavutil/error.h" #include "libavutil/intreadwrite.h" #include "xiph.h" diff --git a/libavcodec/xiph.h b/libavcodec/xiph.h index 1741a51b65..4ab2469528 100644 --- a/libavcodec/xiph.h +++ b/libavcodec/xiph.h @@ -21,7 +21,7 @@ #ifndef AVCODEC_XIPH_H #define AVCODEC_XIPH_H -#include "libavutil/common.h" +#include <stdint.h> /** * Split a single extradata buffer into the three headers that most |