| Message ID | AS8P250MB07448B7BB0BBC745CD6F97378F252@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM |
|---|---|
| State | Accepted |
| Commit | c14dc99f44c68b87efc990b998fa5a9d73c03f1e |
| Headers | show |
| Series | [FFmpeg-devel,1/6] avcodec/tiff: Fix handling of av_strdup() failures | expand |
| Context | Check | Description |
|---|---|---|
| yinshiyou/make_loongarch64 | success | Make finished |
| yinshiyou/make_fate_loongarch64 | success | Make fate finished |
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
Stefano Sabatini: > On date Sunday 2024-03-10 15:15:02 +0100, Andreas Rheinhardt wrote: >> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@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.
On date Sunday 2024-03-10 17:06:18 +0100, Andreas Rheinhardt wrote: > Stefano Sabatini: > >> 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. Makes sense, patch LGTM.
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" - /** 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 <zlib.h> #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
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@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(-)