[FFmpeg-devel] [PATCH 4/6] avcodec/tiff: Improve inclusions

[Andreas Rheinhardt]

Stefano Sabatini:
> On date Sunday 2024-03-10 15:15:02 +0100, Andreas Rheinhardt wrote:
>> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>
>> ---
>>  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 5d350f4e7e..15e5edd93b 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 <stdint.h>
> 
>> -#include "tiff_common.h"
> 
> why? there are cases where only tiff.h must be used?
> 

Must? Like in most header matters, this is not a question of "must".
tiff.h provides (mostly) TIFF related defines that are independent of
any particular implementation, whereas tiff_common.h mostly provides
auxiliary functions for decoder/parser (the encoder only uses
type_sizes*). And not even all of these need it: faxcompr only needs
tiff.h, not tiff_common.h and mjpegdec.c needs only tiff_common.h.

- Andreas

*: This array uses a weird value for strings; the encoder has a size
table of its own with a different value at this position and uses
type_sizes at only one place.