[FFmpeg-cvslog] avcodec/exif: Don't include tiff.h in exif.h

[Andreas Schneider]

ffmpeg | branch: master | Andreas Schneider <asn at cryptomilk.org> | Fri Feb 11 14:11:48 2022 +0100| [59c647bcf3a89a96217eb14256656e393c2bf322] | committer: Andreas Rheinhardt

avcodec/exif: Don't include tiff.h in exif.h

The exif.h header doesn't use anything from tiff.h. We also just need
to include tiff_common.h in .c files where it actually used.

Signed-off-by: Andreas Schneider <asn at cryptomilk.org>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=59c647bcf3a89a96217eb14256656e393c2bf322
---

 libavcodec/exif.c     | 1 +
 libavcodec/exif.h     | 1 -
 libavcodec/mjpegdec.c | 1 +
 libavcodec/webp.c     | 1 +
 4 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/libavcodec/exif.c b/libavcodec/exif.c
index 0b656fd09b..9485b24b8e 100644
--- a/libavcodec/exif.c
+++ b/libavcodec/exif.c
@@ -26,6 +26,7 @@
  */
 
 #include "exif.h"
+#include "tiff_common.h"
 
 
 static const char *exif_get_tag_name(uint16_t id)
diff --git a/libavcodec/exif.h b/libavcodec/exif.h
index 310f6e8e64..ffacba7e66 100644
--- a/libavcodec/exif.h
+++ b/libavcodec/exif.h
@@ -31,7 +31,6 @@
 #include <stdint.h>
 #include "libavutil/dict.h"
 #include "bytestream.h"
-#include "tiff.h"
 
 #define EXIF_MAX_IFD_RECURSION 2
 #define EXIF_TAG_NAME_LENGTH   32
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index a735d2337d..267609d96a 100644
--- a/libavcodec/mjpegdec.c
+++ b/libavcodec/mjpegdec.c
@@ -50,6 +50,7 @@
 #include "tiff.h"
 #include "exif.h"
 #include "bytestream.h"
+#include "tiff_common.h"
 
 
 static int init_default_huffman_tables(MJpegDecodeContext *s)
diff --git a/libavcodec/webp.c b/libavcodec/webp.c
index 9e642e050a..417185e9be 100644
--- a/libavcodec/webp.c
+++ b/libavcodec/webp.c
@@ -49,6 +49,7 @@
 #include "get_bits.h"
 #include "internal.h"
 #include "thread.h"
+#include "tiff_common.h"
 #include "vp8.h"
 
 #define VP8X_FLAG_ANIMATION             0x02