@@ -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;
@@ -24,7 +24,6 @@
#include "avcodec.h"
#include "bytestream.h"
#include "encode.h"
-#include "internal.h"
#define ALIAS_HEADER_SIZE 10
@@ -23,7 +23,6 @@
#include "libavutil/avassert.h"
#include "cbs.h"
#include "cbs_av1.h"
-#include "internal.h"
#include "parser.h"
typedef struct AV1ParseContext {
@@ -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"
@@ -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,
@@ -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,
@@ -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 {
@@ -25,6 +25,7 @@
#include "dcahuff.h"
#include "dcamath.h"
#include "dca_syncwords.h"
+#include "internal.h"
#if ARCH_ARM
#include "arm/dca.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"
@@ -28,6 +28,7 @@
#include "dcahuff.h"
#include "dca_syncwords.h"
#include "bytestream.h"
+#include "internal.h"
#define AMP_MAX 56
@@ -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"
@@ -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)
@@ -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"
@@ -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
@@ -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)
@@ -25,7 +25,6 @@
#include "libavutil/intreadwrite.h"
#include "avcodec.h"
-#include "internal.h"
/* Parser (mostly) copied from dvdsub.c */
@@ -29,7 +29,6 @@
#include "avcodec.h"
#include "bytestream.h"
#include "get_bits.h"
-#include "internal.h"
#include "unary.h"
#include "thread.h"
@@ -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)
@@ -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"
@@ -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)
@@ -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,
@@ -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];
@@ -28,7 +28,6 @@
#include <inttypes.h>
#include "libavutil/imgutils.h"
-#include "internal.h"
#include "mathops.h"
#include "avcodec.h"
#include "h264data.h"
@@ -28,7 +28,6 @@
#include <inttypes.h>
#include "libavutil/avassert.h"
-#include "internal.h"
#include "avcodec.h"
#include "h264.h"
#include "h264dec.h"
@@ -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
@@ -22,9 +22,7 @@
*/
#include "libavutil/avassert.h"
-#include "libavutil/pixdesc.h"
-#include "internal.h"
#include "thread.h"
#include "hevc.h"
#include "hevcdec.h"
@@ -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 };
@@ -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"
@@ -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"
@@ -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. */
@@ -32,7 +32,6 @@
#include <limits.h>
#include "avcodec.h"
-#include "internal.h"
#include "mathops.h"
#include "motion_est.h"
#include "mpegutils.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 */
@@ -25,7 +25,6 @@
#include <string.h>
#include "libavutil/avassert.h"
-#include "libavutil/internal.h"
#include "libavutil/mem.h"
#include "internal.h"
@@ -29,7 +29,6 @@
#include "libavutil/internal.h"
#include "avcodec.h"
-#include "internal.h"
#include "ratecontrol.h"
#include "mpegutils.h"
#include "mpegvideo.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 {
@@ -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"
@@ -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[] = {
@@ -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 {
@@ -29,7 +29,6 @@
#include "libavutil/float_dsp.h"
#include "avcodec.h"
#include "fft.h"
-#include "internal.h"
enum TwinVQCodec {
TWINVQ_CODEC_VQF,
@@ -23,7 +23,6 @@
#include "hwconfig.h"
#include "mpegutils.h"
#include "mpegvideo.h"
-#include "internal.h"
#include "vaapi_decode.h"
/** Reconstruct bitstream f_code */
@@ -22,7 +22,6 @@
#include "h263.h"
#include "hwconfig.h"
-#include "internal.h"
#include "mpeg4video.h"
#include "mpegvideo.h"
#include "vaapi_decode.h"
@@ -21,7 +21,6 @@
*/
#include "hwconfig.h"
-#include "internal.h"
#include "vaapi_decode.h"
#include "vc1.h"
#include "vc1data.h"
@@ -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 */
@@ -24,7 +24,6 @@
#include <vdpau/vdpau.h>
#include "avcodec.h"
-#include "internal.h"
#include "h264dec.h"
#include "h264_ps.h"
#include "hwconfig.h"
@@ -23,7 +23,6 @@
#include <vdpau/vdpau.h>
#include "avcodec.h"
-#include "internal.h"
#include "hevc_data.h"
#include "hevcdec.h"
#include "hwconfig.h"
@@ -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"
@@ -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"
@@ -22,7 +22,6 @@
#include "libavutil/attributes.h"
#include "avcodec.h"
-#include "internal.h"
#include "sinewin.h"
#include "wma.h"
#include "wma_common.h"
@@ -22,7 +22,6 @@
#include "avcodec.h"
#include "encode.h"
-#include "internal.h"
#include "mathops.h"
#define ANSI_MIN_READLINE 509
@@ -27,7 +27,6 @@
#include "xface.h"
#include "avcodec.h"
#include "encode.h"
-#include "internal.h"
#include "libavutil/avassert.h"
typedef struct XFaceContext {
@@ -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"
@@ -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)
@@ -25,7 +25,6 @@
#include "avformat.h"
#include "internal.h"
#include "subtitles.h"
-#include "libavcodec/internal.h"
#include "libavutil/bprint.h"
typedef struct ASSContext {
@@ -23,7 +23,6 @@
#include "libavcodec/golomb.h"
#include "avformat.h"
#include "rawdec.h"
-#include "libavcodec/internal.h"
#define MAX_SPS_COUNT 32
#define MAX_PPS_COUNT 256
@@ -20,7 +20,6 @@
*/
#include "libavutil/intreadwrite.h"
-#include "libavcodec/internal.h"
#include "avformat.h"
#include "internal.h"
#include "pcm.h"
@@ -25,7 +25,6 @@
#include "rawdec.h"
#include "libavutil/intreadwrite.h"
-#include "libavcodec/internal.h"
static int ipu_read_probe(const AVProbeData *p)
{
@@ -28,7 +28,6 @@
#include "avformat.h"
#include "internal.h"
#include "subtitles.h"
-#include "libavcodec/internal.h"
#include "libavcodec/jacosub.h"
#include "libavutil/avstring.h"
#include "libavutil/bprint.h"
@@ -22,7 +22,6 @@
#include "network.h"
#include "tls.h"
#include "url.h"
-#include "libavcodec/internal.h"
#include "libavutil/avutil.h"
#include "libavutil/avassert.h"
#include "libavutil/mem.h"
@@ -27,10 +27,8 @@
#include "avformat.h"
#include "internal.h"
#include "subtitles.h"
-#include "libavcodec/internal.h"
#include "libavutil/avstring.h"
#include "libavutil/bprint.h"
-#include "libavutil/intreadwrite.h"
typedef struct {
FFDemuxSubtitlesQueue q;
@@ -28,7 +28,6 @@
#include "internal.h"
#include "subtitles.h"
#include "avio_internal.h"
-#include "libavcodec/internal.h"
#include "libavutil/avstring.h"
#include "libavutil/bprint.h"
#include "libavutil/intreadwrite.h"
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> --- libavcodec/aac_adtstoasc_bsf.c | 1 - libavcodec/aliaspixenc.c | 1 - libavcodec/av1_parser.c | 1 - libavcodec/avpacket.c | 6 ++---- libavcodec/cbs_av1.c | 2 +- libavcodec/cbs_vp9.c | 1 - libavcodec/cljrenc.c | 2 -- libavcodec/dca_core.c | 1 + libavcodec/dca_core.h | 2 -- libavcodec/dca_lbr.c | 1 + libavcodec/dca_lbr.h | 2 -- libavcodec/dca_xll.c | 1 + libavcodec/dca_xll.h | 2 -- libavcodec/dcadec.c | 1 + libavcodec/dv.c | 7 ------- libavcodec/dvbsub_parser.c | 1 - libavcodec/dxtory.c | 1 - libavcodec/ffv1.c | 6 ------ libavcodec/ffv1.h | 4 ---- libavcodec/fitsenc.c | 1 - libavcodec/flacdata.c | 2 +- libavcodec/flacdata.h | 2 +- libavcodec/h264_ps.c | 1 - libavcodec/h264_refs.c | 1 - libavcodec/hevc_parser.c | 1 - libavcodec/hevc_refs.c | 2 -- libavcodec/hevcdec.c | 1 + libavcodec/hevcdec.h | 2 -- libavcodec/ituh263dec.c | 1 - libavcodec/jpeg2000dwt.c | 1 - libavcodec/motion_est.c | 1 - libavcodec/opusenc.h | 1 - libavcodec/parser.c | 1 - libavcodec/ratecontrol.c | 1 - libavcodec/scpr.h | 5 ----- libavcodec/sheervideo.c | 5 ----- libavcodec/ttadata.c | 1 + libavcodec/ttadata.h | 2 +- libavcodec/twinvq.h | 1 - libavcodec/vaapi_mpeg2.c | 1 - libavcodec/vaapi_mpeg4.c | 1 - libavcodec/vaapi_vc1.c | 1 - libavcodec/vc1_parser.c | 1 - libavcodec/vdpau_h264.c | 1 - libavcodec/vdpau_hevc.c | 1 - libavcodec/vdpau_vp9.c | 1 - libavcodec/vp9mvs.c | 1 - libavcodec/wma.c | 1 - libavcodec/xbmenc.c | 1 - libavcodec/xfaceenc.c | 1 - libavcodec/xwdenc.c | 2 -- libavcodec/yuv4enc.c | 1 - libavformat/assdec.c | 1 - libavformat/h264dec.c | 1 - libavformat/hcom.c | 1 - libavformat/ipudec.c | 1 - libavformat/jacosubdec.c | 1 - libavformat/network.c | 1 - libavformat/samidec.c | 2 -- libavformat/subviewerdec.c | 1 - 60 files changed, 12 insertions(+), 87 deletions(-)