@@ -38,7 +38,6 @@
#include "libavutil/opt.h"
#include "libavutil/thread.h"
#include "bswapdsp.h"
-#include "internal.h"
#include "aac_ac3_parser.h"
#include "ac3_parser_internal.h"
#include "ac3dec.h"
@@ -26,7 +26,6 @@
#include "dcamath.h"
#include "dca_syncwords.h"
#include "decode.h"
-#include "internal.h"
#if ARCH_ARM
#include "arm/dca.h"
@@ -29,7 +29,6 @@
#include "dca_syncwords.h"
#include "bytestream.h"
#include "decode.h"
-#include "internal.h"
#define AMP_MAX 56
@@ -24,7 +24,6 @@
#include "dcamath.h"
#include "dca_syncwords.h"
#include "decode.h"
-#include "internal.h"
#include "unary.h"
static int get_linear(GetBitContext *gb, int n)
@@ -138,4 +138,10 @@ int ff_get_buffer(AVCodecContext *avctx, AVFrame *frame, int flags);
*/
int ff_reget_buffer(AVCodecContext *avctx, AVFrame *frame, int flags);
+/**
+ * Add or update AV_FRAME_DATA_MATRIXENCODING side data.
+ */
+int ff_side_data_update_matrix_encoding(AVFrame *frame,
+ enum AVMatrixEncoding matrix_encoding);
+
#endif /* AVCODEC_DECODE_H */
@@ -205,12 +205,6 @@ int avpriv_h264_has_num_reorder_frames(AVCodecContext *avctx);
int avpriv_codec_get_cap_skip_frame_fill_param(const AVCodec *codec);
-/**
- * Add or update AV_FRAME_DATA_MATRIXENCODING side data.
- */
-int ff_side_data_update_matrix_encoding(AVFrame *frame,
- enum AVMatrixEncoding matrix_encoding);
-
/**
* Add a CPB properties side data to an encoding context.
*/
@@ -38,9 +38,6 @@
#include "codec_internal.h"
#include "decode.h"
#include "get_bits.h"
-#include "internal.h"
-#include "libavutil/crc.h"
-#include "parser.h"
#include "mlp_parse.h"
#include "mlpdsp.h"
#include "mlp.h"
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> --- libavcodec/ac3dec.c | 1 - libavcodec/dca_core.c | 1 - libavcodec/dca_lbr.c | 1 - libavcodec/dca_xll.c | 1 - libavcodec/decode.h | 6 ++++++ libavcodec/internal.h | 6 ------ libavcodec/mlpdec.c | 3 --- 7 files changed, 6 insertions(+), 13 deletions(-)