diff options
author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2023-09-02 12:11:59 +0200 |
---|---|---|
committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2023-09-07 00:30:08 +0200 |
commit | 0c6e5f321bf5c4054e8b98232692465b342b42b4 (patch) | |
tree | 54f06dd5e2fad39bf95aaae9b74acc4fa6f9e670 /libavdevice | |
parent | 4e633e51da64d35c83ae9391a2734d2fd4ef7877 (diff) | |
download | ffmpeg-0c6e5f321bf5c4054e8b98232692465b342b42b4.tar.gz |
avformat/avformat: Avoid including codec.h, frame.h
AVCodec is only ever used as an incomplete type (i.e. via a pointer
to an AVCodec) in avformat.h and it is not really part of the core
of avformat.h or libavformat; almost none of our internal users
make use of it (and none make use of hwcontext.h, which is implicitly
included). So switch to use struct AVCodec, but continue to include
codec.h for external users for compatibility.
Also, do the same for AVFrame and frame.h, which is implicitly included
by codec.h (via lavu/hwcontext.h).
Also, remove an unnecessary inclusion of <time.h>.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Diffstat (limited to 'libavdevice')
-rw-r--r-- | libavdevice/alsa_enc.c | 1 | ||||
-rw-r--r-- | libavdevice/opengl_enc.c | 1 | ||||
-rw-r--r-- | libavdevice/pulse_audio_enc.c | 1 | ||||
-rw-r--r-- | libavdevice/xv.c | 1 |
4 files changed, 4 insertions, 0 deletions
diff --git a/libavdevice/alsa_enc.c b/libavdevice/alsa_enc.c index 62a20c7ba4..4c7805065e 100644 --- a/libavdevice/alsa_enc.c +++ b/libavdevice/alsa_enc.c @@ -39,6 +39,7 @@ #include <alsa/asoundlib.h> +#include "libavutil/frame.h" #include "libavutil/internal.h" #include "libavutil/time.h" diff --git a/libavdevice/opengl_enc.c b/libavdevice/opengl_enc.c index 1b0cf5aa8f..80feda7072 100644 --- a/libavdevice/opengl_enc.c +++ b/libavdevice/opengl_enc.c @@ -49,6 +49,7 @@ #endif #include "libavutil/common.h" +#include "libavutil/frame.h" #include "libavutil/pixdesc.h" #include "libavutil/log.h" #include "libavutil/opt.h" diff --git a/libavdevice/pulse_audio_enc.c b/libavdevice/pulse_audio_enc.c index 3d8323233f..9e594c6424 100644 --- a/libavdevice/pulse_audio_enc.c +++ b/libavdevice/pulse_audio_enc.c @@ -26,6 +26,7 @@ #include "libavformat/mux.h" #include "libavformat/version.h" #include "libavutil/channel_layout.h" +#include "libavutil/frame.h" #include "libavutil/internal.h" #include "libavutil/opt.h" #include "libavutil/time.h" diff --git a/libavdevice/xv.c b/libavdevice/xv.c index 441f854121..b3d79d57a8 100644 --- a/libavdevice/xv.c +++ b/libavdevice/xv.c @@ -32,6 +32,7 @@ #include <X11/extensions/Xvlib.h> #include <sys/shm.h> +#include "libavutil/frame.h" #include "libavutil/opt.h" #include "libavutil/pixdesc.h" #include "libavutil/imgutils.h" |