summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2022-05-12 13:44:21 +0200
committerAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2022-05-15 18:13:56 +0200
commit104abea6469dd290c77b9d3916d3dadac52d4f04 (patch)
treef93d2fe048cdf4d6f8067e3ffeba542c02df0844 /libavformat
parentcbd75ecc18db15f38f101991599f83af3ff48deb (diff)
avcodec/ac3: Move non-(de|en)coder-only parts out of ac3.h
Move AC3HeaderInfo into ac3_parser_internal.h and the rest into a new header ac3defs.h. This also breaks an include cycle of ac3.h and ac3tab.h (the latter now only needs ac3defs.h). Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/hls_sample_encryption.c1
-rw-r--r--libavformat/spdifdec.c2
-rw-r--r--libavformat/spdifenc.c2
3 files changed, 3 insertions, 2 deletions
diff --git a/libavformat/hls_sample_encryption.c b/libavformat/hls_sample_encryption.c
index 08cdf964b6..089662905b 100644
--- a/libavformat/hls_sample_encryption.c
+++ b/libavformat/hls_sample_encryption.c
@@ -33,6 +33,7 @@
#include "libavcodec/adts_header.h"
#include "libavcodec/adts_parser.h"
+#include "libavcodec/ac3tab.h"
#include "libavcodec/ac3_parser_internal.h"
diff --git a/libavformat/spdifdec.c b/libavformat/spdifdec.c
index e39a304247..2af75ca9db 100644
--- a/libavformat/spdifdec.c
+++ b/libavformat/spdifdec.c
@@ -27,7 +27,7 @@
#include "libavutil/bswap.h"
-#include "libavcodec/ac3.h"
+#include "libavcodec/ac3defs.h"
#include "libavcodec/adts_parser.h"
#include "avformat.h"
diff --git a/libavformat/spdifenc.c b/libavformat/spdifenc.c
index 3be89328df..0a634e4232 100644
--- a/libavformat/spdifenc.c
+++ b/libavformat/spdifenc.c
@@ -49,7 +49,7 @@
#include "avformat.h"
#include "avio_internal.h"
#include "spdif.h"
-#include "libavcodec/ac3.h"
+#include "libavcodec/ac3defs.h"
#include "libavcodec/adts_parser.h"
#include "libavcodec/dca.h"
#include "libavcodec/dca_syncwords.h"