From: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
To: ffmpeg-devel@ffmpeg.org
Cc: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Subject: [FFmpeg-devel] [PATCH 3/3] avformat/iamf*: Improve included headers
Date: Wed, 31 Jan 2024 10:32:56 +0100
Message-ID: <AS8P250MB0744639B569EC58672474F8D8F7C2@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM> (raw)
In-Reply-To: <AS8P250MB074419C53DD4BB1A704BD5C08F7C2@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
libavformat/iamf.h | 2 +-
libavformat/iamf_parse.h | 1 -
libavformat/iamf_writer.c | 2 --
libavformat/iamf_writer.h | 3 +--
libavformat/iamfdec.c | 3 ---
libavformat/iamfenc.c | 1 -
6 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/libavformat/iamf.h b/libavformat/iamf.h
index ce94cb5bc4..d88a24c435 100644
--- a/libavformat/iamf.h
+++ b/libavformat/iamf.h
@@ -22,13 +22,13 @@
#ifndef AVFORMAT_IAMF_H
#define AVFORMAT_IAMF_H
+#include <stddef.h>
#include <stdint.h>
#include "libavutil/channel_layout.h"
#include "libavutil/iamf.h"
#include "libavcodec/codec_id.h"
#include "libavcodec/codec_par.h"
-#include "avformat.h"
#define MAX_IAMF_OBU_HEADER_SIZE (1 + 8 * 3)
diff --git a/libavformat/iamf_parse.h b/libavformat/iamf_parse.h
index f4f297ecd4..bb506486d7 100644
--- a/libavformat/iamf_parse.h
+++ b/libavformat/iamf_parse.h
@@ -24,7 +24,6 @@
#include <stdint.h>
-#include "libavutil/iamf.h"
#include "avio.h"
#include "iamf.h"
diff --git a/libavformat/iamf_writer.c b/libavformat/iamf_writer.c
index 5850c53c8e..1a360dee2f 100644
--- a/libavformat/iamf_writer.c
+++ b/libavformat/iamf_writer.c
@@ -24,8 +24,6 @@
#include "libavutil/iamf.h"
#include "libavutil/mem.h"
#include "libavcodec/get_bits.h"
-#include "libavcodec/flac.h"
-#include "libavcodec/mpeg4audio.h"
#include "libavcodec/put_bits.h"
#include "avformat.h"
#include "avio_internal.h"
diff --git a/libavformat/iamf_writer.h b/libavformat/iamf_writer.h
index 93354670b8..24f1c14769 100644
--- a/libavformat/iamf_writer.h
+++ b/libavformat/iamf_writer.h
@@ -22,9 +22,8 @@
#ifndef AVFORMAT_IAMF_WRITER_H
#define AVFORMAT_IAMF_WRITER_H
-#include <stdint.h>
+#include <stddef.h>
-#include "libavutil/common.h"
#include "avformat.h"
#include "avio.h"
#include "iamf.h"
diff --git a/libavformat/iamfdec.c b/libavformat/iamfdec.c
index 3b8d2ff358..99622f697b 100644
--- a/libavformat/iamfdec.c
+++ b/libavformat/iamfdec.c
@@ -19,8 +19,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "config_components.h"
-
#include "libavutil/avassert.h"
#include "libavutil/iamf.h"
#include "libavutil/intreadwrite.h"
@@ -28,7 +26,6 @@
#include "libavcodec/mathops.h"
#include "avformat.h"
#include "avio_internal.h"
-#include "demux.h"
#include "iamf.h"
#include "iamf_parse.h"
#include "internal.h"
diff --git a/libavformat/iamfenc.c b/libavformat/iamfenc.c
index e1003d5495..b588a507bb 100644
--- a/libavformat/iamfenc.c
+++ b/libavformat/iamfenc.c
@@ -24,7 +24,6 @@
#include "libavutil/avassert.h"
#include "libavutil/common.h"
#include "libavutil/iamf.h"
-#include "libavcodec/get_bits.h"
#include "libavcodec/put_bits.h"
#include "avformat.h"
#include "avio_internal.h"
--
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-request@ffmpeg.org with subject "unsubscribe".
next prev parent reply other threads:[~2024-01-31 9:31 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-31 9:31 [FFmpeg-devel] [PATCH 1/3] avformat/iamf_writer: Avoid using dynamic buffer Andreas Rheinhardt
2024-01-31 9:32 ` [FFmpeg-devel] [PATCH 2/3] avformat/iamf_writer, iamfenc: Avoid allocations when using dyn buffers Andreas Rheinhardt
2024-01-31 9:32 ` Andreas Rheinhardt [this message]
2024-02-02 11:30 ` [FFmpeg-devel] [PATCH 1/3] avformat/iamf_writer: Avoid using dynamic buffer Andreas Rheinhardt
2024-02-02 12:32 ` James Almer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=AS8P250MB0744639B569EC58672474F8D8F7C2@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM \
--to=andreas.rheinhardt@outlook.com \
--cc=ffmpeg-devel@ffmpeg.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git