@@ -26,7 +26,6 @@
#include "libavutil/common.h"
-#include "avcodec.h"
#include "ac3.h"
/**
@@ -27,6 +27,9 @@
#ifndef AVCODEC_AC3_H
#define AVCODEC_AC3_H
+#include <math.h>
+#include <stdint.h>
+
#define EAC3_MAX_CHANNELS 16 /**< maximum number of channels in EAC3 */
#define AC3_MAX_CHANNELS 7 /**< maximum number of channels, including coupling channel */
#define CPL_CH 0 /**< coupling channel index */
@@ -39,8 +42,6 @@
#define AC3_CRITICAL_BANDS 50
#define AC3_MAX_CPL_BANDS 18
-#include "libavutil/opt.h"
-#include "avcodec.h"
#include "ac3tab.h"
/* exponent encoding strategy */
@@ -19,9 +19,16 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include <math.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "config.h"
+#include "libavutil/attributes.h"
+#include "libavutil/common.h"
+#include "libavutil/intmath.h"
#include "libavutil/mem_internal.h"
-#include "avcodec.h"
#include "ac3.h"
#include "ac3dsp.h"
#include "mathops.h"
@@ -30,6 +30,7 @@
#include <stdint.h>
+#include "libavutil/opt.h"
#include "ac3.h"
#include "ac3dsp.h"
#include "avcodec.h"
@@ -25,9 +25,8 @@
*/
#include "libavutil/channel_layout.h"
-#include "libavutil/mem_internal.h"
-#include "avcodec.h"
+#include "ac3.h"
#include "ac3tab.h"
/**
@@ -21,10 +21,12 @@
*/
#include <inttypes.h>
+#include <stddef.h>
+#include "config.h"
#include "libavutil/avassert.h"
#include "libavutil/common.h"
-#include "avcodec.h"
+#include "libavutil/log.h"
#include "acelp_filters.h"
const int16_t ff_acelp_interp_filter[61] = { /* (0.15) */
@@ -24,9 +24,13 @@
* Provide registration of all codecs, parsers and bitstream filters for libavcodec.
*/
+#include <stdint.h>
+#include <string.h>
+
#include "config.h"
#include "libavutil/thread.h"
-#include "avcodec.h"
+#include "codec.h"
+#include "codec_id.h"
extern const AVCodec ff_a64multi_encoder;
extern const AVCodec ff_a64multi5_encoder;
@@ -19,7 +19,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "avcodec.h"
+#include "libavutil/common.h"
+#include "libavutil/error.h"
+#include "libavutil/mem.h"
#include "ass_split.h"
typedef enum {
@@ -26,13 +26,11 @@
*/
#include <math.h>
-#include <stddef.h>
-#include <stdio.h>
#include <string.h>
+#include "libavutil/attributes.h"
#include "libavutil/thread.h"
-#include "avcodec.h"
#include "atrac.h"
float ff_atrac_sf_table[64];
@@ -21,10 +21,14 @@
#ifndef AVCODEC_AV1_PARSE_H
#define AVCODEC_AV1_PARSE_H
+#include <limits.h>
#include <stdint.h>
+#include "libavutil/common.h"
+#include "libavutil/error.h"
+#include "libavutil/intmath.h"
+
#include "av1.h"
-#include "avcodec.h"
#include "get_bits.h"
// OBU header fields + max leb128 length
@@ -28,10 +28,21 @@
* bitstream api.
*/
+#include <inttypes.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+
+#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/mem.h"
#include "libavutil/qsort.h"
-#include "avcodec.h"
-#include "internal.h"
#include "mathops.h"
#include "put_bits.h"
#include "vlc.h"
@@ -22,8 +22,6 @@
#ifndef AVCODEC_BMP_H
#define AVCODEC_BMP_H
-#include "avcodec.h"
-
typedef enum {
BMP_RGB =0,
BMP_RLE8 =1,
@@ -20,9 +20,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <inttypes.h>
+#include <stdint.h>
+#include <string.h>
-#include "avcodec.h"
+#include "config.h"
#include "celp_filters.h"
#include "libavutil/avassert.h"
#include "libavutil/common.h"
@@ -20,11 +20,13 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include <stddef.h>
+
+#include "libavutil/avassert.h"
#include "libavutil/common.h"
-#include "avcodec.h"
-#include "get_bits.h"
#include "dcahuff.h"
+#include "put_bits.h"
#define TMODE_COUNT 4
static const uint8_t tmode_vlc_bits[TMODE_COUNT] = { 3, 3, 3, 2 };
@@ -23,11 +23,12 @@
#ifndef AVCODEC_DCAHUFF_H
#define AVCODEC_DCAHUFF_H
-#include "libavutil/common.h"
+#include <stdint.h>
+
+#include "libavutil/attributes.h"
-#include "avcodec.h"
-#include "get_bits.h"
#include "put_bits.h"
+#include "vlc.h"
#define DCA_CODE_BOOKS 10
#define DCA_BITALLOC_12_COUNT 5
@@ -26,12 +26,10 @@
* @author Marco Gerards <marco@gnu.org>, David Conrad, Jordi Ortiz <nenjordi@gmail.com>
*/
-#include "libavutil/imgutils.h"
+#include "libavutil/pixdesc.h"
-#include "avcodec.h"
#include "dirac.h"
#include "golomb.h"
-#include "internal.h"
#include "mpeg12data.h"
#if CONFIG_DIRAC_PARSE
@@ -21,10 +21,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include <string.h>
+#include "libavutil/attributes.h"
+#include "libavutil/reverse.h"
#include "libavutil/thread.h"
-#include "libavcodec/internal.h"
-#include "libavcodec/mathops.h"
-#include "avcodec.h"
#include "dsd.h"
#define CTABLES ((HTAPS + 7) / 8) /** number of "8 MACs" lookup tables */
@@ -24,9 +24,8 @@
#ifndef AVCODEC_DSD_H
#define AVCODEC_DSD_H
-#include "libavcodec/internal.h"
-#include "libavcodec/mathops.h"
-#include "avcodec.h"
+#include <stddef.h>
+#include <stdint.h>
#define HTAPS 48 /** number of FIR constants */
#define FIFOSIZE 16 /** must be a power of two */
@@ -29,7 +29,6 @@
#include "libavutil/common.h"
#include "libavutil/lfg.h"
#include "elbg.h"
-#include "avcodec.h"
#define DELTA_ERR_MAX 0.1 ///< Precision of the ELBG algorithm (as percentage error)
@@ -31,7 +31,6 @@
#include "libavutil/common.h"
#include "libavutil/intreadwrite.h"
-#include "avcodec.h"
#include "elsdec.h"
/* ELS coder constants and structures. */
@@ -28,8 +28,8 @@
#ifndef AVCODEC_EXIF_H
#define AVCODEC_EXIF_H
-#include "avcodec.h"
-#include "bytestream.h"
+#include <stdint.h>
+#include "libavutil/dict.h"
#include "tiff.h"
#define EXIF_MAX_IFD_RECURSION 2
@@ -19,8 +19,13 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "avcodec.h"
+#include <inttypes.h>
+#include <limits.h>
+#include <stdio.h>
+#include <string.h>
#include "libavutil/dict.h"
+#include "libavutil/error.h"
+#include "libavutil/log.h"
#include "fits.h"
int avpriv_fits_header_init(FITSHeader *header, FITSHeaderState state)
@@ -26,7 +26,7 @@
#define AVCODEC_G722_H
#include <stdint.h>
-#include "avcodec.h"
+#include "libavutil/log.h"
#include "g722dsp.h"
#define PREV_SAMPLES_BUF_SIZE 1024
@@ -21,11 +21,12 @@
*/
#include <stdint.h>
+#include <string.h>
#include "libavutil/common.h"
+#include "libavutil/intmath.h"
#include "acelp_vectors.h"
-#include "avcodec.h"
#include "celp_math.h"
#include "g723_1.h"
@@ -18,10 +18,14 @@
* License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <inttypes.h>
-#include <limits.h>
-#include "avcodec.h"
+#include <stdint.h>
+#include <string.h>
+
+#include "libavutil/common.h"
+#include "libavutil/intmath.h"
+
+#include "audiodsp.h"
#include "g729.h"
#include "g729postfilter.h"
#include "celp_math.h"
@@ -23,7 +23,6 @@
#define AVCODEC_GSMDEC_DATA_H
#include <stdint.h>
-#include "avcodec.h"
typedef struct GSMContext {
// Contains first 120 elements from the previous frame
@@ -25,8 +25,8 @@
* H.261 codec
*/
-#include "avcodec.h"
#include "h261.h"
+#include "mpegvideo.h"
#define IS_FIL(a) ((a) & MB_TYPE_H261_FIL)
@@ -27,17 +27,16 @@
* H.263/MPEG-4 codec.
*/
-#include <limits.h>
-
#include "libavutil/thread.h"
-#include "avcodec.h"
#include "mpegvideo.h"
#include "h263.h"
#include "h263data.h"
+#include "h263dsp.h"
+#include "idctdsp.h"
#include "mathops.h"
+#include "mpegpicture.h"
#include "mpegutils.h"
-#include "flv.h"
-#include "mpeg4video.h"
+#include "rl.h"
static av_cold void h263_init_rl_inter(void)
{
@@ -24,7 +24,9 @@
#include <stdint.h>
#include "libavutil/buffer.h"
-#include "avcodec.h"
+#include "libavutil/error.h"
+#include "libavutil/log.h"
+#include "codec_id.h"
#include "get_bits.h"
#define MAX_MBPAIR_SIZE (256*1024) // a tighter bound could be calculated if someone cares about a few bytes
@@ -35,7 +35,6 @@
#include "cabac.h"
#include "cabac_functions.h"
#include "internal.h"
-#include "avcodec.h"
#include "h264dec.h"
#include "h264data.h"
#include "h264_mvpred.h"
@@ -29,7 +29,6 @@
#define UNCHECKED_BITSTREAM_READER 1
#include "internal.h"
-#include "avcodec.h"
#include "h264dec.h"
#include "h264_mvpred.h"
#include "h264data.h"
@@ -16,7 +16,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "avcodec.h"
+#include <stddef.h>
+#include "libavutil/common.h"
#include "h264_levels.h"
// H.264 table A-1.
@@ -25,10 +25,10 @@
#include "libavutil/intreadwrite.h"
#include "libavutil/mem.h"
-#include "avcodec.h"
#include "bsf.h"
#include "bsf_internal.h"
#include "bytestream.h"
+#include "defs.h"
#include "h264.h"
typedef struct H264BSFContext {
@@ -25,13 +25,19 @@
* @author Michael Niedermayer <michaelni@gmx.at>
*/
+#include <limits.h>
+#include <stdio.h>
+#include <string.h>
+#include "libavutil/common.h"
+#include "libavutil/error.h"
+#include "libavutil/log.h"
+#include "libavutil/mem.h"
#include "atsc_a53.h"
-#include "avcodec.h"
#include "get_bits.h"
#include "golomb.h"
#include "h264_ps.h"
#include "h264_sei.h"
-#include "internal.h"
+#include "sei.h"
#define AVERROR_PS_NOT_FOUND FFERRTAG(0xF8,'?','P','S')
@@ -30,9 +30,9 @@
#include "libavutil/avutil.h"
-#include "avcodec.h"
#include "h264dec.h"
#include "h264data.h"
+#include "mpegutils.h"
const uint8_t ff_h264_golomb_to_pict_type[5] = {
AV_PICTURE_TYPE_P, AV_PICTURE_TYPE_B, AV_PICTURE_TYPE_I,
@@ -30,7 +30,6 @@
#include "libavutil/attributes.h"
#include "libavutil/avassert.h"
-#include "avcodec.h"
#include "h264dsp.h"
#include "h264idct.h"
#include "startcode.h"
@@ -25,11 +25,13 @@
* @author Michael Niedermayer <michaelni@gmx.at>
*/
+#include "config.h"
#include "libavutil/attributes.h"
#include "libavutil/avassert.h"
#include "libavutil/intreadwrite.h"
-#include "avcodec.h"
+#include "codec_id.h"
#include "h264pred.h"
+#include "mathops.h"
#define BIT_DEPTH 8
#include "h264pred_template.c"
@@ -24,10 +24,10 @@
#include "libavutil/intreadwrite.h"
#include "libavutil/mem.h"
-#include "avcodec.h"
#include "bsf.h"
#include "bsf_internal.h"
#include "bytestream.h"
+#include "defs.h"
#include "hevc.h"
#define MIN_HEVCC_LENGTH 23
@@ -26,7 +26,8 @@
* for Indeo Video Interactive codecs.
*/
-#include "avcodec.h"
+#include <string.h>
+#include "libavutil/common.h"
#include "ivi.h"
#include "ivi_dsp.h"
@@ -25,7 +25,9 @@
* JPEG-LS common code.
*/
-#include "internal.h"
+#include <stddef.h>
+#include "libavutil/internal.h"
+#include "libavutil/intmath.h"
#include "jpegls.h"
void ff_jpegls_init_state(JLSState *state)
@@ -28,9 +28,8 @@
#ifndef AVCODEC_JPEGLS_H
#define AVCODEC_JPEGLS_H
+#include <limits.h>
#include "libavutil/common.h"
-#include "avcodec.h"
-#include "internal.h"
#undef near /* This file uses struct member 'near' which in windows.h is defined as empty. */
@@ -20,7 +20,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "avcodec.h"
+#include "config.h"
+#include "libavutil/attributes.h"
#include "lossless_audiodsp.h"
static int32_t scalarproduct_and_madd_int16_c(int16_t *v1, const int16_t *v2,
@@ -19,10 +19,9 @@
#ifndef AVCODEC_LOSSLESS_VIDEOENCDSP_H
#define AVCODEC_LOSSLESS_VIDEOENCDSP_H
+#include <stddef.h>
#include <stdint.h>
-#include "avcodec.h"
-
typedef struct LLVidEncDSPContext {
void (*diff_bytes)(uint8_t *dst /* align 16 */,
const uint8_t *src1 /* align 16 */,
@@ -23,8 +23,8 @@
#include <inttypes.h>
-#include "avcodec.h"
#define FRAC_BITS 14
+#include "libavutil/common.h"
#include "mathops.h"
#include "lsp.h"
#include "libavcodec/mips/lsp_mips.h"
@@ -27,7 +27,7 @@
* @author modified for use in TIFF by Konstantin Shishkov
*/
-#include "avcodec.h"
+#include "libavutil/attributes.h"
#include "bytestream.h"
#include "lzw.h"
#include "libavutil/mem.h"
@@ -25,9 +25,10 @@
* @author Bartlomiej Wolowiec
*/
-#include "avcodec.h"
+#include <stdint.h>
+#include "libavutil/avassert.h"
+#include "libavutil/common.h"
#include "lzw.h"
-#include "mathops.h"
#include "put_bits.h"
#define LZW_MAXBITS 12
@@ -24,8 +24,6 @@
#include <stdint.h>
-#include "avcodec.h"
-
/** Last possible matrix channel for each codec */
#define MAX_MATRIX_CHANNEL_MLP 5
#define MAX_MATRIX_CHANNEL_TRUEHD 7
@@ -26,10 +26,9 @@
* divided into 32 subbands.
*/
-#include "libavutil/attributes.h"
-#include "avcodec.h"
+#include <string.h>
+#include "libavutil/intmath.h"
#include "mpegaudiodsp.h"
-#include "mpegaudio.h"
#include "mpc.h"
#include "mpcdata.h"
@@ -29,10 +29,11 @@
#ifndef AVCODEC_MPC_H
#define AVCODEC_MPC_H
+#include <stdint.h>
+
#include "libavutil/lfg.h"
#include "libavutil/mem_internal.h"
-#include "avcodec.h"
#include "bswapdsp.h"
#include "mpegaudio.h"
#include "mpegaudiodsp.h"
@@ -26,8 +26,6 @@
#include "libavutil/common.h"
-#include "avcodec.h"
-#include "internal.h"
#include "mpegaudio.h"
#include "mpegaudiodata.h"
#include "mpegaudiodecheader.h"
@@ -27,7 +27,8 @@
#ifndef AVCODEC_MPEGAUDIODECHEADER_H
#define AVCODEC_MPEGAUDIODECHEADER_H
-#include "avcodec.h"
+#include <stdint.h>
+#include "codec_id.h"
#define MP3_MASK 0xFFFE0CCF
@@ -31,9 +31,11 @@
* implementors. The original code is available from http://code.google.com/p/nelly2pcm/
*/
+#include <stdlib.h>
+
+#include "libavutil/intmath.h"
#include "libavutil/common.h"
-#include "avcodec.h"
#include "nellymoser.h"
const float ff_nelly_dequantization_table[127] = {
@@ -34,7 +34,7 @@
#ifndef AVCODEC_NELLYMOSER_H
#define AVCODEC_NELLYMOSER_H
-#include "avcodec.h"
+#include <stdint.h>
#define NELLY_BANDS 23
#define NELLY_BLOCK_LEN 64
@@ -18,7 +18,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "avcodec.h"
#include "bsf.h"
#include "bsf_internal.h"
#include "libavutil/avassert.h"
@@ -18,7 +18,9 @@
* License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "avcodec.h"
+
+#include <stdint.h>
+#include "libavutil/mem.h"
#include "png.h"
/* Mask to determine which y pixels are valid in a pass */
@@ -34,9 +34,9 @@
#include "libavutil/attributes.h"
#include "libavutil/avassert.h"
+#include "libavutil/bswap.h"
#include "libavutil/intreadwrite.h"
-#include "avcodec.h"
#include "rangecoder.h"
av_cold void ff_init_range_encoder(RangeCoder *c, uint8_t *buf, int buf_size)
@@ -27,9 +27,8 @@
#ifndef AVCODEC_RAW_H
#define AVCODEC_RAW_H
-#include "avcodec.h"
+#include "libavutil/pixfmt.h"
#include "internal.h"
-#include "libavutil/internal.h"
typedef struct PixelFormatTag {
enum AVPixelFormat pix_fmt;
@@ -19,9 +19,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include <string.h>
+
#include "libavutil/common.h"
-#include "avcodec.h"
#include "rle.h"
int ff_rle_count_pixels(const uint8_t *start, int len, int bpp, int same)
@@ -24,7 +24,8 @@
* id RoQ Video common functions based on work by Dr. Tim Ferguson
*/
-#include "avcodec.h"
+#include <stdint.h>
+#include <string.h>
#include "roqvideo.h"
static inline void block_copy(unsigned char *out, unsigned char *in,
@@ -24,10 +24,13 @@
* RV30 decoder motion compensation functions
*/
-#include "avcodec.h"
+#include <stddef.h>
+#include <stdint.h>
+#include "libavutil/attributes.h"
#include "h264chroma.h"
#include "h264qpel.h"
#include "mathops.h"
+#include "qpeldsp.h"
#include "rv34dsp.h"
#define RV30_LOWPASS(OPNAME, OP) \
@@ -26,7 +26,6 @@
#include "libavutil/common.h"
#include "libavutil/intreadwrite.h"
-#include "avcodec.h"
#include "h264qpel.h"
#include "mathops.h"
#include "pixels.h"
@@ -30,7 +30,6 @@
* SBC common functions for the encoder and decoder
*/
-#include "avcodec.h"
#include "sbc.h"
/* A2DP specification: Appendix B, page 69 */
@@ -33,7 +33,8 @@
#ifndef AVCODEC_SBC_H
#define AVCODEC_SBC_H
-#include "avcodec.h"
+#include <stddef.h>
+#include <stdint.h>
#include "libavutil/crc.h"
#include "libavutil/mem_internal.h"
@@ -26,7 +26,6 @@
#include "libavutil/opt.h"
#include "libavutil/eval.h"
-#include "avcodec.h"
#include "bsf.h"
#include "bsf_internal.h"
@@ -26,7 +26,6 @@
*/
#include "libavutil/intreadwrite.h"
-#include "avcodec.h"
#include "mathops.h"
#include "simple_idct.h"
@@ -25,6 +25,7 @@
* @author Thilo Borgmann <thilo.borgmann _at_ mail.de>
*/
+#include "libavutil/bprint.h"
#include "tiff_common.h"
@@ -28,10 +28,9 @@
#ifndef AVCODEC_TIFF_COMMON_H
#define AVCODEC_TIFF_COMMON_H
-#include "avcodec.h"
-#include "tiff.h"
+#include <stdint.h>
+#include "libavutil/dict.h"
#include "bytestream.h"
-#include "libavutil/bprint.h"
/** data type identifiers for TIFF tags */
enum TiffTypes {
@@ -25,9 +25,12 @@
#define AVCODEC_V4L2_BUFFERS_H
#include <stdatomic.h>
+#include <stddef.h>
#include <linux/videodev2.h>
-#include "avcodec.h"
+#include "libavutil/buffer.h"
+#include "libavutil/frame.h"
+#include "packet.h"
enum V4L2Buffer_status {
V4L2BUF_AVAILABLE,
@@ -24,13 +24,14 @@
#ifndef AVCODEC_V4L2_CONTEXT_H
#define AVCODEC_V4L2_CONTEXT_H
-#include <stdatomic.h>
+#include <stdint.h>
#include <linux/videodev2.h>
-#include "libavcodec/avcodec.h"
#include "libavutil/pixfmt.h"
#include "libavutil/frame.h"
-#include "libavutil/buffer.h"
+#include "libavutil/rational.h"
+#include "codec_id.h"
+#include "packet.h"
#include "v4l2_buffers.h"
typedef struct V4L2Context {
@@ -24,8 +24,9 @@
#ifndef AVCODEC_V4L2_FMT_H
#define AVCODEC_V4L2_FMT_H
-#include "libavcodec/avcodec.h"
+#include <stdint.h>
#include "libavutil/pixfmt.h"
+#include "codec_id.h"
enum AVPixelFormat ff_v4l2_format_v4l2_to_avfmt(uint32_t v4l2_fmt, enum AVCodecID avcodec);
uint32_t ff_v4l2_format_avcodec_to_v4l2(enum AVCodecID avcodec);
@@ -26,9 +26,9 @@
* VC-1 tables.
*/
-#include "avcodec.h"
#include "vc1.h"
#include "vc1data.h"
+#include "vlc.h"
/** Table for conversion between TTBLK and TTMB */
const int ff_vc1_ttblk_to_tt[3][8] = {
@@ -24,12 +24,15 @@
* source code.
*/
+#include <string.h>
+
+#include "config.h"
#include "libavutil/attributes.h"
#include "libavutil/common.h"
+#include "libavutil/internal.h"
#include "libavutil/intreadwrite.h"
#include "libavutil/avassert.h"
-#include "avcodec.h"
#include "rnd_avg.h"
#include "vp3dsp.h"
@@ -21,8 +21,8 @@
#include <stdint.h>
+#include "config.h"
#include "libavutil/attributes.h"
-#include "avcodec.h"
#include "vp56dsp.h"
#include "libavutil/common.h"
@@ -23,9 +23,6 @@
#include "libavutil/avassert.h"
-#include "avcodec.h"
-#include "internal.h"
-#include "videodsp.h"
#include "vp56.h"
#include "vp9.h"
#include "vp9data.h"
@@ -24,8 +24,6 @@
#include "libavutil/avassert.h"
#include "libavutil/mem_internal.h"
-#include "avcodec.h"
-#include "internal.h"
#include "videodsp.h"
#include "vp9data.h"
#include "vp9dec.h"
@@ -23,7 +23,6 @@
#include "libavutil/mem_internal.h"
-#include "avcodec.h"
#include "intrax8.h"
#include "mpegvideo.h"
#include "wmv2dsp.h"
@@ -16,11 +16,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "config.h"
#include "libavutil/attributes.h"
#include "libavutil/common.h"
-#include "avcodec.h"
#include "idctdsp.h"
#include "mathops.h"
+#include "qpeldsp.h"
#include "wmv2dsp.h"
#define W0 2048
@@ -18,12 +18,13 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include <stddef.h>
#include <stdint.h>
+#include "config.h"
#include "libavutil/attributes.h"
#include "libavutil/cpu.h"
#include "libavutil/x86/cpu.h"
-#include "libavcodec/avcodec.h"
#include "libavcodec/cfhddsp.h"
void ff_cfhd_horiz_filter_sse2(int16_t *output, ptrdiff_t out_stride,
@@ -18,12 +18,13 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include <stddef.h>
#include <stdint.h>
+#include "config.h"
#include "libavutil/attributes.h"
#include "libavutil/cpu.h"
#include "libavutil/x86/cpu.h"
-#include "libavcodec/avcodec.h"
#include "libavcodec/cfhdencdsp.h"
void ff_cfhdenc_horiz_filter_sse2(int16_t *input, int16_t *low, int16_t *high,
@@ -18,10 +18,13 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include <stddef.h>
+#include <stdint.h>
+#include "config.h"
#include "libavutil/attributes.h"
#include "libavutil/cpu.h"
#include "libavutil/x86/cpu.h"
-#include "libavcodec/avcodec.h"
+#include "libavcodec/codec_id.h"
#include "libavcodec/h264pred.h"
#define PRED4x4(TYPE, DEPTH, OPT) \
@@ -19,8 +19,11 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include <stdint.h>
+#include "config.h"
#include "libavutil/attributes.h"
#include "libavutil/cpu.h"
+#include "libavutil/macros.h"
#include "libavutil/x86/asm.h"
#include "libavutil/x86/cpu.h"
#include "libavcodec/mlpdsp.h"
@@ -19,10 +19,11 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include <stdint.h>
+#include "config.h"
#include "libavutil/attributes.h"
#include "libavutil/cpu.h"
#include "libavutil/x86/asm.h"
-#include "libavcodec/avcodec.h"
#include "libavcodec/snow.h"
#include "libavcodec/snow_dwt.h"
@@ -19,7 +19,6 @@
#include "libavutil/avassert.h"
#include "libavutil/samplefmt.h"
#include "libavutil/pixfmt.h"
-#include "libavcodec/avcodec.h"
#include "avdevice.h"
#include "internal.h"
#include "config.h"
@@ -32,7 +32,6 @@
#include "libavutil/log.h"
-#include "libavcodec/avcodec.h"
#include "avdevice.h"
#include "oss.h"
@@ -19,8 +19,9 @@
#ifndef AVDEVICE_OSS_H
#define AVDEVICE_OSS_H
-#include "libavcodec/avcodec.h"
-
+#include <stdint.h>
+#include "libavutil/log.h"
+#include "libavcodec/codec_id.h"
#include "libavformat/avformat.h"
#define OSS_AUDIO_BLOCK_SIZE 4096
@@ -34,8 +34,6 @@
#include "libavutil/opt.h"
#include "libavutil/time.h"
-#include "libavcodec/avcodec.h"
-
#include "avdevice.h"
#include "libavformat/internal.h"
@@ -30,8 +30,6 @@
#include "libavutil/internal.h"
-#include "libavcodec/avcodec.h"
-
#include "avdevice.h"
#include "libavformat/internal.h"
@@ -37,8 +37,6 @@
#include "libavutil/timestamp.h"
#include "libavutil/samplefmt.h"
-#include "libavcodec/avcodec.h"
-
#include "audio.h"
#include "avfilter.h"
#include "internal.h"
@@ -20,6 +20,7 @@
*/
#include "libavutil/common.h"
+#include "libavcodec/codec_id.h"
#include "mxf.h"
const uint8_t ff_mxf_random_index_pack_key[16] = { 0x06,0x0e,0x2b,0x34,0x02,0x05,0x01,0x01,0x0d,0x01,0x02,0x01,0x01,0x11,0x01,0x00 };
@@ -21,9 +21,10 @@
#ifndef AVFORMAT_MXF_H
#define AVFORMAT_MXF_H
-#include "avformat.h"
-#include "libavcodec/avcodec.h"
#include <stdint.h>
+#include "libavutil/log.h"
+#include "libavutil/pixfmt.h"
+#include "libavutil/rational.h"
typedef uint8_t UID[16];
@@ -20,9 +20,10 @@
*/
#include "config.h"
-#include "libavutil/error.h"
-#include "libavcodec/avcodec.h"
+#include "libavutil/common.h"
#include "avformat.h"
+#include "internal.h"
+#include "metadata.h"
#include "riff.h"
/* Note: When encoding, the first matching tag is used, so order is
@@ -28,7 +28,6 @@
#ifndef AVFORMAT_RIFF_H
#define AVFORMAT_RIFF_H
-#include "libavcodec/avcodec.h"
#include "avio.h"
#include "internal.h"
#include "metadata.h"
@@ -19,12 +19,11 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "libavutil/avassert.h"
#include "libavutil/dict.h"
#include "libavutil/error.h"
+#include "libavutil/intreadwrite.h"
#include "libavutil/log.h"
-#include "libavutil/mathematics.h"
-#include "libavcodec/avcodec.h"
-#include "libavcodec/bytestream.h"
#include "avformat.h"
#include "avio_internal.h"
#include "riff.h"
@@ -21,9 +21,11 @@
#ifndef AVFORMAT_RTP_H
#define AVFORMAT_RTP_H
+#include <stdint.h>
+#include "libavutil/avutil.h"
+#include "libavcodec/codec_id.h"
+#include "libavcodec/codec_par.h"
#include "libavformat/avformat.h"
-#include "libavcodec/avcodec.h"
-#include "libavutil/mathematics.h"
/**
* Return the payload type for a given stream used in the given format context.
@@ -23,7 +23,8 @@
#ifndef AVFORMAT_RTPDEC_H
#define AVFORMAT_RTPDEC_H
-#include "libavcodec/avcodec.h"
+#include "libavcodec/codec_id.h"
+#include "libavcodec/packet.h"
#include "avformat.h"
#include "rtp.h"
#include "url.h"
@@ -28,7 +28,6 @@
#include <string.h>
#include "libavutil/avassert.h"
#include "libavutil/intreadwrite.h"
-#include "libavcodec/avcodec.h"
#include "internal.h"
#include "rtp.h"
#include "rtpdec.h"
@@ -21,6 +21,7 @@
#include "libavutil/pixdesc.h"
#include "libavutil/pixfmt.h"
+#include "libavcodec/avcodec.h"
#include "vpcc.h"
enum VPX_CHROMA_SUBSAMPLING
@@ -27,10 +27,10 @@
#ifndef AVFORMAT_VPCC_H
#define AVFORMAT_VPCC_H
-#include <stdint.h>
+#include "libavutil/rational.h"
+#include "libavcodec/codec_par.h"
#include "avio.h"
#include "avformat.h"
-#include "libavcodec/avcodec.h"
typedef struct VPCC {
int profile;
Also remove other unnecessary headers and include headers directly while at it. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> --- libavcodec/ac3.c | 1 - libavcodec/ac3.h | 5 +++-- libavcodec/ac3dsp.c | 9 ++++++++- libavcodec/ac3enc.h | 1 + libavcodec/ac3tab.c | 3 +-- libavcodec/acelp_filters.c | 4 +++- libavcodec/allcodecs.c | 6 +++++- libavcodec/ass_split.c | 4 +++- libavcodec/atrac.c | 4 +--- libavcodec/av1_parse.h | 6 +++++- libavcodec/bitstream.c | 15 +++++++++++++-- libavcodec/bmp.h | 2 -- libavcodec/celp_filters.c | 5 +++-- libavcodec/dcahuff.c | 6 ++++-- libavcodec/dcahuff.h | 7 ++++--- libavcodec/dirac.c | 4 +--- libavcodec/dsd.c | 6 +++--- libavcodec/dsd.h | 5 ++--- libavcodec/elbg.c | 1 - libavcodec/elsdec.c | 1 - libavcodec/exif.h | 4 ++-- libavcodec/fits.c | 7 ++++++- libavcodec/g722.h | 2 +- libavcodec/g723_1.c | 3 ++- libavcodec/g729postfilter.c | 10 +++++++--- libavcodec/gsmdec_data.h | 1 - libavcodec/h261.c | 2 +- libavcodec/h263.c | 9 ++++----- libavcodec/h2645_parse.h | 4 +++- libavcodec/h264_cabac.c | 1 - libavcodec/h264_cavlc.c | 1 - libavcodec/h264_levels.c | 3 ++- libavcodec/h264_mp4toannexb_bsf.c | 2 +- libavcodec/h264_sei.c | 10 ++++++++-- libavcodec/h264data.c | 2 +- libavcodec/h264dsp.c | 1 - libavcodec/h264pred.c | 4 +++- libavcodec/hevc_mp4toannexb_bsf.c | 2 +- libavcodec/ivi_dsp.c | 3 ++- libavcodec/jpegls.c | 4 +++- libavcodec/jpegls.h | 3 +-- libavcodec/lossless_audiodsp.c | 3 ++- libavcodec/lossless_videoencdsp.h | 3 +-- libavcodec/lsp.c | 2 +- libavcodec/lzw.c | 2 +- libavcodec/lzwenc.c | 5 +++-- libavcodec/mlp.h | 2 -- libavcodec/mpc.c | 5 ++--- libavcodec/mpc.h | 3 ++- libavcodec/mpegaudiodecheader.c | 2 -- libavcodec/mpegaudiodecheader.h | 3 ++- libavcodec/nellymoser.c | 4 +++- libavcodec/nellymoser.h | 2 +- libavcodec/pcm_rechunk_bsf.c | 1 - libavcodec/png.c | 4 +++- libavcodec/rangecoder.c | 2 +- libavcodec/raw.h | 3 +-- libavcodec/rle.c | 3 ++- libavcodec/roqvideo.c | 3 ++- libavcodec/rv30dsp.c | 5 ++++- libavcodec/rv40dsp.c | 1 - libavcodec/sbc.c | 1 - libavcodec/sbc.h | 3 ++- libavcodec/setts_bsf.c | 1 - libavcodec/simple_idct.c | 1 - libavcodec/tiff_common.c | 1 + libavcodec/tiff_common.h | 5 ++--- libavcodec/v4l2_buffers.h | 5 ++++- libavcodec/v4l2_context.h | 7 ++++--- libavcodec/v4l2_fmt.h | 3 ++- libavcodec/vc1data.c | 2 +- libavcodec/vp3dsp.c | 5 ++++- libavcodec/vp56dsp.c | 2 +- libavcodec/vp9block.c | 3 --- libavcodec/vp9recon.c | 2 -- libavcodec/wmv2.h | 1 - libavcodec/wmv2dsp.c | 3 ++- libavcodec/x86/cfhddsp_init.c | 3 ++- libavcodec/x86/cfhdencdsp_init.c | 3 ++- libavcodec/x86/h264_intrapred_init.c | 5 ++++- libavcodec/x86/mlpdsp_init.c | 3 +++ libavcodec/x86/snowdsp.c | 3 ++- libavdevice/avdevice.c | 1 - libavdevice/oss.c | 1 - libavdevice/oss.h | 5 +++-- libavdevice/oss_dec.c | 2 -- libavdevice/oss_enc.c | 2 -- libavfilter/af_ashowinfo.c | 2 -- libavformat/mxf.c | 1 + libavformat/mxf.h | 5 +++-- libavformat/riff.c | 5 +++-- libavformat/riff.h | 1 - libavformat/riffdec.c | 5 ++--- libavformat/rtp.h | 6 ++++-- libavformat/rtpdec.h | 3 ++- libavformat/rtpdec_qdm2.c | 1 - libavformat/vpcc.c | 1 + libavformat/vpcc.h | 4 ++-- 98 files changed, 196 insertions(+), 142 deletions(-)