Message ID | DB6PR0101MB2214088877CAC7DC298BBAA28FDD9@DB6PR0101MB2214.eurprd01.prod.exchangelabs.com |
---|---|
State | Accepted |
Commit | c5b2ddfe18a0fccab25723676b2a0b2c348ccf00 |
Headers | show |
Series | [FFmpeg-devel] avcodec/iff: Remove redundant #if | expand |
Context | Check | Description |
---|---|---|
yinshiyou/make_loongarch64 | success | Make finished |
yinshiyou/make_fate_loongarch64 | success | Make fate finished |
andriy/make_armv7_RPi4 | success | Make finished |
andriy/make_fate_armv7_RPi4 | success | Make fate finished |
lgtm
diff --git a/libavcodec/iff.c b/libavcodec/iff.c index 36c9535d54..74ebddc621 100644 --- a/libavcodec/iff.c +++ b/libavcodec/iff.c @@ -26,8 +26,6 @@ * IFF ACBM/ANIM/DEEP/ILBM/PBM/RGB8/RGBN bitmap decoder */ -#include "config_components.h" - #include <stdint.h> #include "libavutil/imgutils.h" @@ -1908,7 +1906,6 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *frame, return buf_size; } -#if CONFIG_IFF_ILBM_DECODER const FFCodec ff_iff_ilbm_decoder = { .p.name = "iff", .p.long_name = NULL_IF_CONFIG_SMALL("IFF ACBM/ANIM/DEEP/ILBM/PBM/RGB8/RGBN"), @@ -1921,4 +1918,3 @@ const FFCodec ff_iff_ilbm_decoder = { .p.capabilities = AV_CODEC_CAP_DR1, .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, }; -#endif
Since ec0275843d8eb933699807da81f6f366291f034a this file is compiled iff IFF ILBM decoder is enabled. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> --- libavcodec/iff.c | 4 ---- 1 file changed, 4 deletions(-)