From c14dc99f44c68b87efc990b998fa5a9d73c03f1e Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Sat, 9 Mar 2024 15:08:47 +0100 Subject: [PATCH] avcodec/tiff: Improve inclusions Reviewed-by: Stefano Sabatini Signed-off-by: Andreas Rheinhardt --- libavcodec/mjpegdec.c | 1 - libavcodec/tiff.c | 1 + libavcodec/tiff.h | 3 --- libavcodec/tiffenc.c | 3 +-- 4 files changed, 2 insertions(+), 6 deletions(-) diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 43b36d0a8f..c9409eac6c 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -52,7 +52,6 @@ #include "jpeglsdec.h" #include "profiles.h" #include "put_bits.h" -#include "tiff.h" #include "exif.h" #include "bytestream.h" #include "tiff_common.h" diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c index 6a0f8ee1e7..8f278bfd12 100644 --- a/libavcodec/tiff.c +++ b/libavcodec/tiff.c @@ -48,6 +48,7 @@ #include "faxcompr.h" #include "lzw.h" #include "tiff.h" +#include "tiff_common.h" #include "tiff_data.h" #include "mjpegdec.h" #include "thread.h" diff --git a/libavcodec/tiff.h b/libavcodec/tiff.h index e67c59abad..2dd21dea52 100644 --- a/libavcodec/tiff.h +++ b/libavcodec/tiff.h @@ -30,9 +30,6 @@ #ifndef AVCODEC_TIFF_H #define AVCODEC_TIFF_H -#include -#include "tiff_common.h" - /** TIFF types in ascenting priority (last in the list is highest) */ enum TiffType { /** TIFF image based on the TIFF 6.0 or TIFF/EP (ISO 12234-2) specifications */ diff --git a/libavcodec/tiffenc.c b/libavcodec/tiffenc.c index dfe308ee17..7c3c03f1f3 100644 --- a/libavcodec/tiffenc.c +++ b/libavcodec/tiffenc.c @@ -30,7 +30,6 @@ #include #endif -#include "libavutil/imgutils.h" #include "libavutil/log.h" #include "libavutil/opt.h" #include "libavutil/pixdesc.h" @@ -39,9 +38,9 @@ #include "codec_internal.h" #include "encode.h" #include "lzw.h" -#include "put_bits.h" #include "rle.h" #include "tiff.h" +#include "tiff_common.h" #include "version.h" #define TIFF_MAX_ENTRY 32