summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2022-08-25 02:00:21 +0200
committerAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2022-08-27 14:14:57 +0200
commitd1a5ef406946d7a9b9abbe3c8373d258a69deedf (patch)
treef2130cfc2c5d6d9a083ad782e5c1abdd953b0ec2
parent59eadb5060acd07ad2d4dc5dbb354ee81f034222 (diff)
avcodec/internal: Move ff_side_data_update_matrix_encoding to decode.h
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
-rw-r--r--libavcodec/ac3dec.c1
-rw-r--r--libavcodec/dca_core.c1
-rw-r--r--libavcodec/dca_lbr.c1
-rw-r--r--libavcodec/dca_xll.c1
-rw-r--r--libavcodec/decode.h6
-rw-r--r--libavcodec/internal.h6
-rw-r--r--libavcodec/mlpdec.c3
7 files changed, 6 insertions, 13 deletions
diff --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c
index b1db3dc9e6..5d0add40fe 100644
--- a/libavcodec/ac3dec.c
+++ b/libavcodec/ac3dec.c
@@ -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"
diff --git a/libavcodec/dca_core.c b/libavcodec/dca_core.c
index b181171104..1655116eed 100644
--- a/libavcodec/dca_core.c
+++ b/libavcodec/dca_core.c
@@ -26,7 +26,6 @@
#include "dcamath.h"
#include "dca_syncwords.h"
#include "decode.h"
-#include "internal.h"
#if ARCH_ARM
#include "arm/dca.h"
diff --git a/libavcodec/dca_lbr.c b/libavcodec/dca_lbr.c
index ec55404c7b..5343bcde8a 100644
--- a/libavcodec/dca_lbr.c
+++ b/libavcodec/dca_lbr.c
@@ -29,7 +29,6 @@
#include "dca_syncwords.h"
#include "bytestream.h"
#include "decode.h"
-#include "internal.h"
#define AMP_MAX 56
diff --git a/libavcodec/dca_xll.c b/libavcodec/dca_xll.c
index 242c3a13fe..fe2c766d98 100644
--- a/libavcodec/dca_xll.c
+++ b/libavcodec/dca_xll.c
@@ -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)
diff --git a/libavcodec/decode.h b/libavcodec/decode.h
index d40327d5ab..5d95369b5e 100644
--- a/libavcodec/decode.h
+++ b/libavcodec/decode.h
@@ -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 */
diff --git a/libavcodec/internal.h b/libavcodec/internal.h
index 6f34f98d4e..0065ccec8c 100644
--- a/libavcodec/internal.h
+++ b/libavcodec/internal.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.
*/
AVCPBProperties *ff_add_cpb_side_data(AVCodecContext *avctx);
diff --git a/libavcodec/mlpdec.c b/libavcodec/mlpdec.c
index dba2b9ac34..bfd0091323 100644
--- a/libavcodec/mlpdec.c
+++ b/libavcodec/mlpdec.c
@@ -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"