From 6e5e74c55bb71e17dcfc7519c6badf3334644f48 Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Mon, 17 Jul 2023 02:56:57 +0200 Subject: [PATCH] avcodec/evc*: Improve included headers In particular, don't include avcodec.h in evc_frame_merge_bsf.c. Signed-off-by: Andreas Rheinhardt --- libavcodec/evc_frame_merge_bsf.c | 3 +-- libavcodec/evc_parse.c | 1 - libavcodec/evc_parse.h | 1 - libavcodec/evc_parser.c | 2 +- libavcodec/evc_ps.c | 2 +- 5 files changed, 3 insertions(+), 6 deletions(-) diff --git a/libavcodec/evc_frame_merge_bsf.c b/libavcodec/evc_frame_merge_bsf.c index cfdf24c69e..7b8e6b1c9e 100644 --- a/libavcodec/evc_frame_merge_bsf.c +++ b/libavcodec/evc_frame_merge_bsf.c @@ -18,13 +18,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include "get_bits.h" -#include "golomb.h" #include "bsf.h" #include "bsf_internal.h" -#include "avcodec.h" #include "evc.h" #include "evc_parse.h" +#include "evc_ps.h" // Access unit data typedef struct AccessUnitBuffer { diff --git a/libavcodec/evc_parse.c b/libavcodec/evc_parse.c index 447f6195c2..bd3a4416f2 100644 --- a/libavcodec/evc_parse.c +++ b/libavcodec/evc_parse.c @@ -17,7 +17,6 @@ */ #include "golomb.h" -#include "parser.h" #include "evc.h" #include "evc_parse.h" diff --git a/libavcodec/evc_parse.h b/libavcodec/evc_parse.h index 55cdd553ea..4712310826 100644 --- a/libavcodec/evc_parse.h +++ b/libavcodec/evc_parse.h @@ -28,7 +28,6 @@ #include "libavutil/intreadwrite.h" #include "libavutil/log.h" -#include "libavutil/rational.h" #include "evc.h" #include "evc_ps.h" diff --git a/libavcodec/evc_parser.c b/libavcodec/evc_parser.c index 76790d8111..8590ebcdaf 100644 --- a/libavcodec/evc_parser.c +++ b/libavcodec/evc_parser.c @@ -20,7 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "parser.h" +#include "avcodec.h" #include "bytestream.h" #include "evc.h" #include "evc_parse.h" diff --git a/libavcodec/evc_ps.c b/libavcodec/evc_ps.c index fc2105b352..04ee6a45e6 100644 --- a/libavcodec/evc_ps.c +++ b/libavcodec/evc_ps.c @@ -16,8 +16,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "get_bits.h" #include "golomb.h" -#include "parser.h" #include "evc.h" #include "evc_ps.h"