This avoids including lavc/codec_desc.h everywhere and thereby
forces users to include it directly instead of lazily and potentially
unknowingly relying on indirect inclusions.
Also add the proper inclusion to libavformat/demux.c, one of the
two files that actually use the new field.
Signed-off-by: Andreas Rheinhardt <andreas.rheinha...@outlook.com>
---
libavformat/demux.c | 1 +
libavformat/internal.h | 3 +--
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavformat/demux.c b/libavformat/demux.c
index 1ef297d5e7..b218f64574 100644
--- a/libavformat/demux.c
+++ b/libavformat/demux.c
@@ -36,6 +36,7 @@
#include "libavcodec/avcodec.h"
#include "libavcodec/bsf.h"
+#include "libavcodec/codec_desc.h"
#include "libavcodec/internal.h"
#include "libavcodec/packet_internal.h"
#include "libavcodec/raw.h"
diff --git a/libavformat/internal.h b/libavformat/internal.h
index 9fc980601f..594afd731d 100644
--- a/libavformat/internal.h
+++ b/libavformat/internal.h
@@ -23,7 +23,6 @@
#include <stdint.h>
-#include "libavcodec/codec_desc.h"
#include "libavcodec/packet_internal.h"
#include "avformat.h"
@@ -410,7 +409,7 @@ typedef struct FFStream {
int64_t first_dts;
int64_t cur_dts;
- const AVCodecDescriptor *codec_desc;
+ const struct AVCodecDescriptor *codec_desc;
} FFStream;
static av_always_inline FFStream *ffstream(AVStream *st)
--
2.34.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
