diff options
Diffstat (limited to 'libavcodec')
52 files changed, 12 insertions, 78 deletions
diff --git a/libavcodec/aac_adtstoasc_bsf.c b/libavcodec/aac_adtstoasc_bsf.c index 69453c706f..267ef97572 100644 --- a/libavcodec/aac_adtstoasc_bsf.c +++ b/libavcodec/aac_adtstoasc_bsf.c @@ -26,7 +26,6 @@ #include "put_bits.h" #include "get_bits.h" #include "mpeg4audio.h" -#include "internal.h" typedef struct AACBSFContext { int first_frame_done; diff --git a/libavcodec/aliaspixenc.c b/libavcodec/aliaspixenc.c index fa273df9c2..27b7d1d8de 100644 --- a/libavcodec/aliaspixenc.c +++ b/libavcodec/aliaspixenc.c @@ -24,7 +24,6 @@ #include "avcodec.h" #include "bytestream.h" #include "encode.h" -#include "internal.h" #define ALIAS_HEADER_SIZE 10 diff --git a/libavcodec/av1_parser.c b/libavcodec/av1_parser.c index d2dfdb3580..4cbd7408a0 100644 --- a/libavcodec/av1_parser.c +++ b/libavcodec/av1_parser.c @@ -23,7 +23,6 @@ #include "libavutil/avassert.h" #include "cbs.h" #include "cbs_av1.h" -#include "internal.h" #include "parser.h" typedef struct AV1ParseContext { diff --git a/libavcodec/avpacket.c b/libavcodec/avpacket.c index 4f7a6b255c..bcbc4166cb 100644 --- a/libavcodec/avpacket.c +++ b/libavcodec/avpacket.c @@ -22,14 +22,12 @@ #include <string.h> #include "libavutil/avassert.h" -#include "libavutil/common.h" -#include "libavutil/internal.h" +#include "libavutil/intreadwrite.h" #include "libavutil/mathematics.h" #include "libavutil/mem.h" #include "libavutil/rational.h" -#include "bytestream.h" -#include "internal.h" +#include "defs.h" #include "packet.h" #include "packet_internal.h" diff --git a/libavcodec/cbs_av1.c b/libavcodec/cbs_av1.c index 04314443de..1229480567 100644 --- a/libavcodec/cbs_av1.c +++ b/libavcodec/cbs_av1.c @@ -20,10 +20,10 @@ #include "libavutil/opt.h" #include "libavutil/pixfmt.h" +#include "avcodec.h" #include "cbs.h" #include "cbs_internal.h" #include "cbs_av1.h" -#include "internal.h" static int cbs_av1_read_uvlc(CodedBitstreamContext *ctx, GetBitContext *gbc, diff --git a/libavcodec/cbs_vp9.c b/libavcodec/cbs_vp9.c index 333d70ba4e..ae7f88a8a3 100644 --- a/libavcodec/cbs_vp9.c +++ b/libavcodec/cbs_vp9.c @@ -21,7 +21,6 @@ #include "cbs.h" #include "cbs_internal.h" #include "cbs_vp9.h" -#include "internal.h" static int cbs_vp9_read_s(CodedBitstreamContext *ctx, GetBitContext *gbc, diff --git a/libavcodec/cljrenc.c b/libavcodec/cljrenc.c index aa53a110d0..21e033753b 100644 --- a/libavcodec/cljrenc.c +++ b/libavcodec/cljrenc.c @@ -24,12 +24,10 @@ * Cirrus Logic AccuPak encoder. */ -#include "libavutil/common.h" #include "libavutil/opt.h" #include "avcodec.h" #include "encode.h" -#include "internal.h" #include "put_bits.h" typedef struct CLJRContext { diff --git a/libavcodec/dca_core.c b/libavcodec/dca_core.c index 758e3447a6..80f3525b46 100644 --- a/libavcodec/dca_core.c +++ b/libavcodec/dca_core.c @@ -25,6 +25,7 @@ #include "dcahuff.h" #include "dcamath.h" #include "dca_syncwords.h" +#include "internal.h" #if ARCH_ARM #include "arm/dca.h" diff --git a/libavcodec/dca_core.h b/libavcodec/dca_core.h index 86bfa62203..cb8e38a94b 100644 --- a/libavcodec/dca_core.h +++ b/libavcodec/dca_core.h @@ -21,13 +21,11 @@ #ifndef AVCODEC_DCA_CORE_H #define AVCODEC_DCA_CORE_H -#include "libavutil/common.h" #include "libavutil/float_dsp.h" #include "libavutil/fixed_dsp.h" #include "libavutil/mem_internal.h" #include "avcodec.h" -#include "internal.h" #include "get_bits.h" #include "dca.h" #include "dca_exss.h" diff --git a/libavcodec/dca_lbr.c b/libavcodec/dca_lbr.c index 481a8df7e6..c1e3b0ddc3 100644 --- a/libavcodec/dca_lbr.c +++ b/libavcodec/dca_lbr.c @@ -28,6 +28,7 @@ #include "dcahuff.h" #include "dca_syncwords.h" #include "bytestream.h" +#include "internal.h" #define AMP_MAX 56 diff --git a/libavcodec/dca_lbr.h b/libavcodec/dca_lbr.h index 2eccbe1ff2..db7a676c31 100644 --- a/libavcodec/dca_lbr.h +++ b/libavcodec/dca_lbr.h @@ -21,12 +21,10 @@ #ifndef AVCODEC_DCA_LBR_H #define AVCODEC_DCA_LBR_H -#include "libavutil/common.h" #include "libavutil/float_dsp.h" #include "libavutil/mem_internal.h" #include "avcodec.h" -#include "internal.h" #include "get_bits.h" #include "dca.h" #include "dca_exss.h" diff --git a/libavcodec/dca_xll.c b/libavcodec/dca_xll.c index ab14dbcc88..316045b588 100644 --- a/libavcodec/dca_xll.c +++ b/libavcodec/dca_xll.c @@ -23,6 +23,7 @@ #include "dcadata.h" #include "dcamath.h" #include "dca_syncwords.h" +#include "internal.h" #include "unary.h" static int get_linear(GetBitContext *gb, int n) diff --git a/libavcodec/dca_xll.h b/libavcodec/dca_xll.h index 3aaad6d370..d223133019 100644 --- a/libavcodec/dca_xll.h +++ b/libavcodec/dca_xll.h @@ -21,11 +21,9 @@ #ifndef AVCODEC_DCA_XLL_H #define AVCODEC_DCA_XLL_H -#include "libavutil/common.h" #include "libavutil/mem_internal.h" #include "avcodec.h" -#include "internal.h" #include "get_bits.h" #include "dca.h" #include "dcadsp.h" diff --git a/libavcodec/dcadec.c b/libavcodec/dcadec.c index 43694b51f7..49b52f805f 100644 --- a/libavcodec/dcadec.c +++ b/libavcodec/dcadec.c @@ -25,6 +25,7 @@ #include "dcadec.h" #include "dcahuff.h" #include "dca_syncwords.h" +#include "internal.h" #include "profiles.h" #define MIN_PACKET_SIZE 16 diff --git a/libavcodec/dv.c b/libavcodec/dv.c index 8a4cac859e..e2550c4cc1 100644 --- a/libavcodec/dv.c +++ b/libavcodec/dv.c @@ -38,15 +38,8 @@ * DV codec. */ -#include "libavutil/internal.h" -#include "libavutil/pixdesc.h" - #include "avcodec.h" #include "dv.h" -#include "dvdata.h" -#include "internal.h" -#include "put_bits.h" -#include "simple_idct.h" static inline void dv_calc_mb_coordinates(const AVDVProfile *d, int chan, int seq, int slot, uint16_t *tbl) diff --git a/libavcodec/dvbsub_parser.c b/libavcodec/dvbsub_parser.c index 88bf5b9d74..b2d5446867 100644 --- a/libavcodec/dvbsub_parser.c +++ b/libavcodec/dvbsub_parser.c @@ -25,7 +25,6 @@ #include "libavutil/intreadwrite.h" #include "avcodec.h" -#include "internal.h" /* Parser (mostly) copied from dvdsub.c */ diff --git a/libavcodec/dxtory.c b/libavcodec/dxtory.c index 914131e742..36c30c1dbc 100644 --- a/libavcodec/dxtory.c +++ b/libavcodec/dxtory.c @@ -29,7 +29,6 @@ #include "avcodec.h" #include "bytestream.h" #include "get_bits.h" -#include "internal.h" #include "unary.h" #include "thread.h" diff --git a/libavcodec/ffv1.c b/libavcodec/ffv1.c index d8a0c39254..7eaa72f244 100644 --- a/libavcodec/ffv1.c +++ b/libavcodec/ffv1.c @@ -27,15 +27,9 @@ #include "libavutil/attributes.h" #include "libavutil/avassert.h" -#include "libavutil/crc.h" -#include "libavutil/opt.h" -#include "libavutil/imgutils.h" -#include "libavutil/pixdesc.h" #include "avcodec.h" -#include "internal.h" #include "rangecoder.h" -#include "mathops.h" #include "ffv1.h" av_cold int ff_ffv1_common_init(AVCodecContext *avctx) diff --git a/libavcodec/ffv1.h b/libavcodec/ffv1.h index 8ffe5ab433..ba612bc258 100644 --- a/libavcodec/ffv1.h +++ b/libavcodec/ffv1.h @@ -28,13 +28,9 @@ * FF Video Codec 1 (a lossless codec) */ -#include "libavutil/crc.h" -#include "libavutil/opt.h" #include "libavutil/imgutils.h" -#include "libavutil/pixdesc.h" #include "avcodec.h" #include "get_bits.h" -#include "internal.h" #include "mathops.h" #include "put_bits.h" #include "rangecoder.h" diff --git a/libavcodec/fitsenc.c b/libavcodec/fitsenc.c index dfaa04cdbd..3ac1141b69 100644 --- a/libavcodec/fitsenc.c +++ b/libavcodec/fitsenc.c @@ -33,7 +33,6 @@ #include "avcodec.h" #include "bytestream.h" #include "encode.h" -#include "internal.h" static int fits_encode_frame(AVCodecContext *avctx, AVPacket *pkt, const AVFrame *pict, int *got_packet) diff --git a/libavcodec/flacdata.c b/libavcodec/flacdata.c index 1954f32d32..d96e3e0966 100644 --- a/libavcodec/flacdata.c +++ b/libavcodec/flacdata.c @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "internal.h" +#include "flacdata.h" const int ff_flac_sample_rate_table[16] = { 0, diff --git a/libavcodec/flacdata.h b/libavcodec/flacdata.h index e2c1e5d7f2..ef21840777 100644 --- a/libavcodec/flacdata.h +++ b/libavcodec/flacdata.h @@ -22,7 +22,7 @@ #ifndef AVCODEC_FLACDATA_H #define AVCODEC_FLACDATA_H -#include "internal.h" +#include <stdint.h> extern const int ff_flac_sample_rate_table[16]; diff --git a/libavcodec/h264_ps.c b/libavcodec/h264_ps.c index 6927fa7198..051f06692c 100644 --- a/libavcodec/h264_ps.c +++ b/libavcodec/h264_ps.c @@ -28,7 +28,6 @@ #include <inttypes.h> #include "libavutil/imgutils.h" -#include "internal.h" #include "mathops.h" #include "avcodec.h" #include "h264data.h" diff --git a/libavcodec/h264_refs.c b/libavcodec/h264_refs.c index 94b473257f..50bbe94917 100644 --- a/libavcodec/h264_refs.c +++ b/libavcodec/h264_refs.c @@ -28,7 +28,6 @@ #include <inttypes.h> #include "libavutil/avassert.h" -#include "internal.h" #include "avcodec.h" #include "h264.h" #include "h264dec.h" diff --git a/libavcodec/hevc_parser.c b/libavcodec/hevc_parser.c index c944a6aacd..59f9a0ff3e 100644 --- a/libavcodec/hevc_parser.c +++ b/libavcodec/hevc_parser.c @@ -28,7 +28,6 @@ #include "hevc_ps.h" #include "hevc_sei.h" #include "h2645_parse.h" -#include "internal.h" #include "parser.h" #define START_CODE 0x000001 ///< start_code_prefix_one_3bytes diff --git a/libavcodec/hevc_refs.c b/libavcodec/hevc_refs.c index 06e42d9c53..d496918feb 100644 --- a/libavcodec/hevc_refs.c +++ b/libavcodec/hevc_refs.c @@ -22,9 +22,7 @@ */ #include "libavutil/avassert.h" -#include "libavutil/pixdesc.h" -#include "internal.h" #include "thread.h" #include "hevc.h" #include "hevcdec.h" diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c index 8d7a4f7147..ed012c4e75 100644 --- a/libavcodec/hevcdec.c +++ b/libavcodec/hevcdec.c @@ -44,6 +44,7 @@ #include "hevc_parse.h" #include "hevcdec.h" #include "hwconfig.h" +#include "internal.h" #include "profiles.h" const uint8_t ff_hevc_pel_weight[65] = { [2] = 0, [4] = 1, [6] = 2, [8] = 3, [12] = 4, [16] = 5, [24] = 6, [32] = 7, [48] = 8, [64] = 9 }; diff --git a/libavcodec/hevcdec.h b/libavcodec/hevcdec.h index 157bc6926f..8e26c852db 100644 --- a/libavcodec/hevcdec.h +++ b/libavcodec/hevcdec.h @@ -26,7 +26,6 @@ #include <stdatomic.h> #include "libavutil/buffer.h" -#include "libavutil/md5.h" #include "libavutil/mem_internal.h" #include "avcodec.h" @@ -41,7 +40,6 @@ #include "hevc_sei.h" #include "hevcdsp.h" #include "h274.h" -#include "internal.h" #include "thread.h" #include "videodsp.h" diff --git a/libavcodec/ituh263dec.c b/libavcodec/ituh263dec.c index 7d7a1f01a2..445d5f3f36 100644 --- a/libavcodec/ituh263dec.c +++ b/libavcodec/ituh263dec.c @@ -40,7 +40,6 @@ #include "h263.h" #include "h263data.h" #include "h263dec.h" -#include "internal.h" #include "mathops.h" #include "mpegutils.h" #include "unary.h" diff --git a/libavcodec/jpeg2000dwt.c b/libavcodec/jpeg2000dwt.c index f9a0977407..ed24091fe8 100644 --- a/libavcodec/jpeg2000dwt.c +++ b/libavcodec/jpeg2000dwt.c @@ -28,7 +28,6 @@ #include "libavutil/common.h" #include "libavutil/mem.h" #include "jpeg2000dwt.h" -#include "internal.h" /* Defines for 9/7 DWT lifting parameters. * Parameters are in float. */ diff --git a/libavcodec/motion_est.c b/libavcodec/motion_est.c index 5b0958733c..9c548c1567 100644 --- a/libavcodec/motion_est.c +++ b/libavcodec/motion_est.c @@ -32,7 +32,6 @@ #include <limits.h> #include "avcodec.h" -#include "internal.h" #include "mathops.h" #include "motion_est.h" #include "mpegutils.h" diff --git a/libavcodec/opusenc.h b/libavcodec/opusenc.h index b623b3e948..32d23deead 100644 --- a/libavcodec/opusenc.h +++ b/libavcodec/opusenc.h @@ -22,7 +22,6 @@ #ifndef AVCODEC_OPUSENC_H #define AVCODEC_OPUSENC_H -#include "internal.h" #include "opus_celt.h" /* Determines the maximum delay the psychoacoustic system will use for lookahead */ diff --git a/libavcodec/parser.c b/libavcodec/parser.c index 3b459cc125..24fe44eb30 100644 --- a/libavcodec/parser.c +++ b/libavcodec/parser.c @@ -25,7 +25,6 @@ #include <string.h> #include "libavutil/avassert.h" -#include "libavutil/internal.h" #include "libavutil/mem.h" #include "internal.h" diff --git a/libavcodec/ratecontrol.c b/libavcodec/ratecontrol.c index 6b77ccd006..9cfc21df64 100644 --- a/libavcodec/ratecontrol.c +++ b/libavcodec/ratecontrol.c @@ -29,7 +29,6 @@ #include "libavutil/internal.h" #include "avcodec.h" -#include "internal.h" #include "ratecontrol.h" #include "mpegutils.h" #include "mpegvideo.h" diff --git a/libavcodec/scpr.h b/libavcodec/scpr.h index 15cb87c464..d161a42c6e 100644 --- a/libavcodec/scpr.h +++ b/libavcodec/scpr.h @@ -23,13 +23,8 @@ #ifndef AVCODEC_SCPR_H #define AVCODEC_SCPR_H -#include <stdio.h> -#include <stdlib.h> -#include <string.h> - #include "avcodec.h" #include "bytestream.h" -#include "internal.h" #include "scpr3.h" typedef struct RangeCoder { diff --git a/libavcodec/sheervideo.c b/libavcodec/sheervideo.c index fb5a39303e..dbe8e4f516 100644 --- a/libavcodec/sheervideo.c +++ b/libavcodec/sheervideo.c @@ -19,17 +19,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <stdio.h> -#include <stdlib.h> -#include <string.h> - #define CACHED_BITSTREAM_READER !ARCH_X86_32 #define SHEER_VLC_BITS 12 #include "libavutil/intreadwrite.h" #include "avcodec.h" #include "get_bits.h" -#include "internal.h" #include "thread.h" #include "sheervideodata.h" diff --git a/libavcodec/ttadata.c b/libavcodec/ttadata.c index aa9f418a7d..297d709480 100644 --- a/libavcodec/ttadata.c +++ b/libavcodec/ttadata.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <string.h> #include "ttadata.h" const uint32_t ff_tta_shift_1[] = { diff --git a/libavcodec/ttadata.h b/libavcodec/ttadata.h index 48c4cd0354..1ec1d749ce 100644 --- a/libavcodec/ttadata.h +++ b/libavcodec/ttadata.h @@ -21,7 +21,7 @@ #ifndef AVCODEC_TTADATA_H #define AVCODEC_TTADATA_H -#include "internal.h" +#include <stdint.h> #define MAX_ORDER 16 typedef struct TTAFilter { diff --git a/libavcodec/twinvq.h b/libavcodec/twinvq.h index 24e5ebcd0b..234604f581 100644 --- a/libavcodec/twinvq.h +++ b/libavcodec/twinvq.h @@ -29,7 +29,6 @@ #include "libavutil/float_dsp.h" #include "avcodec.h" #include "fft.h" -#include "internal.h" enum TwinVQCodec { TWINVQ_CODEC_VQF, diff --git a/libavcodec/vaapi_mpeg2.c b/libavcodec/vaapi_mpeg2.c index 26e0cd827c..ba70ddef31 100644 --- a/libavcodec/vaapi_mpeg2.c +++ b/libavcodec/vaapi_mpeg2.c @@ -23,7 +23,6 @@ #include "hwconfig.h" #include "mpegutils.h" #include "mpegvideo.h" -#include "internal.h" #include "vaapi_decode.h" /** Reconstruct bitstream f_code */ diff --git a/libavcodec/vaapi_mpeg4.c b/libavcodec/vaapi_mpeg4.c index 71e155154c..bc11a7e417 100644 --- a/libavcodec/vaapi_mpeg4.c +++ b/libavcodec/vaapi_mpeg4.c @@ -22,7 +22,6 @@ #include "h263.h" #include "hwconfig.h" -#include "internal.h" #include "mpeg4video.h" #include "mpegvideo.h" #include "vaapi_decode.h" diff --git a/libavcodec/vaapi_vc1.c b/libavcodec/vaapi_vc1.c index 4e9607d9be..d82b5b31f8 100644 --- a/libavcodec/vaapi_vc1.c +++ b/libavcodec/vaapi_vc1.c @@ -21,7 +21,6 @@ */ #include "hwconfig.h" -#include "internal.h" #include "vaapi_decode.h" #include "vc1.h" #include "vc1data.h" diff --git a/libavcodec/vc1_parser.c b/libavcodec/vc1_parser.c index 00896ddb09..8257e0ccfa 100644 --- a/libavcodec/vc1_parser.c +++ b/libavcodec/vc1_parser.c @@ -29,7 +29,6 @@ #include "parser.h" #include "vc1.h" #include "get_bits.h" -#include "internal.h" /** The maximum number of bytes of a sequence, entry point or * frame header whose values we pay any attention to */ diff --git a/libavcodec/vdpau_h264.c b/libavcodec/vdpau_h264.c index 5ba73dafd4..525e208495 100644 --- a/libavcodec/vdpau_h264.c +++ b/libavcodec/vdpau_h264.c @@ -24,7 +24,6 @@ #include <vdpau/vdpau.h> #include "avcodec.h" -#include "internal.h" #include "h264dec.h" #include "h264_ps.h" #include "hwconfig.h" diff --git a/libavcodec/vdpau_hevc.c b/libavcodec/vdpau_hevc.c index c17de0c5d0..2669040f78 100644 --- a/libavcodec/vdpau_hevc.c +++ b/libavcodec/vdpau_hevc.c @@ -23,7 +23,6 @@ #include <vdpau/vdpau.h> #include "avcodec.h" -#include "internal.h" #include "hevc_data.h" #include "hevcdec.h" #include "hwconfig.h" diff --git a/libavcodec/vdpau_vp9.c b/libavcodec/vdpau_vp9.c index a8609d647e..49fe18189b 100644 --- a/libavcodec/vdpau_vp9.c +++ b/libavcodec/vdpau_vp9.c @@ -23,7 +23,6 @@ #include <vdpau/vdpau.h> #include "libavutil/pixdesc.h" #include "avcodec.h" -#include "internal.h" #include "vp9data.h" #include "vp9dec.h" #include "hwconfig.h" diff --git a/libavcodec/vp9mvs.c b/libavcodec/vp9mvs.c index 88db1c341c..774aaa3910 100644 --- a/libavcodec/vp9mvs.c +++ b/libavcodec/vp9mvs.c @@ -21,7 +21,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "internal.h" #include "vp56.h" #include "vp9.h" #include "vp9data.h" diff --git a/libavcodec/wma.c b/libavcodec/wma.c index d9fda2dbfa..c73711df48 100644 --- a/libavcodec/wma.c +++ b/libavcodec/wma.c @@ -22,7 +22,6 @@ #include "libavutil/attributes.h" #include "avcodec.h" -#include "internal.h" #include "sinewin.h" #include "wma.h" #include "wma_common.h" diff --git a/libavcodec/xbmenc.c b/libavcodec/xbmenc.c index 5e552ce820..05e014a0bf 100644 --- a/libavcodec/xbmenc.c +++ b/libavcodec/xbmenc.c @@ -22,7 +22,6 @@ #include "avcodec.h" #include "encode.h" -#include "internal.h" #include "mathops.h" #define ANSI_MIN_READLINE 509 diff --git a/libavcodec/xfaceenc.c b/libavcodec/xfaceenc.c index 55815e5c2f..ae258f559e 100644 --- a/libavcodec/xfaceenc.c +++ b/libavcodec/xfaceenc.c @@ -27,7 +27,6 @@ #include "xface.h" #include "avcodec.h" #include "encode.h" -#include "internal.h" #include "libavutil/avassert.h" typedef struct XFaceContext { diff --git a/libavcodec/xwdenc.c b/libavcodec/xwdenc.c index a65f83abdd..31a263b8df 100644 --- a/libavcodec/xwdenc.c +++ b/libavcodec/xwdenc.c @@ -20,12 +20,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavutil/intreadwrite.h" #include "libavutil/pixdesc.h" #include "avcodec.h" #include "bytestream.h" #include "encode.h" -#include "internal.h" #include "xwd.h" #define WINDOW_NAME "lavcxwdenc" diff --git a/libavcodec/yuv4enc.c b/libavcodec/yuv4enc.c index 5181a46403..11dfc68a0d 100644 --- a/libavcodec/yuv4enc.c +++ b/libavcodec/yuv4enc.c @@ -22,7 +22,6 @@ #include "avcodec.h" #include "encode.h" -#include "internal.h" static int yuv4_encode_frame(AVCodecContext *avctx, AVPacket *pkt, const AVFrame *pic, int *got_packet) |