diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-08-29 13:38:02 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-09-03 15:42:57 +0200 |
| commit | 48286d4d98e6417dff397d6f15e6b2ca3310f0ca (patch) | |
| tree | 32ee2a1b56b100f84a1fffcf5e888ce2f3a49e49 | |
| parent | dea974456035d8d43c69a23b9db036a544bb0455 (diff) | |
avcodec/codec_internal: Add macro to set AVCodec.long_name
It reduces typing: Before this patch, there were 105 codecs
whose long_name-definition exceeded the 80 char line length
limit. Now there are only nine of them.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
503 files changed, 623 insertions, 618 deletions
diff --git a/libavcodec/012v.c b/libavcodec/012v.c index 700feb3024..2d89a86b98 100644 --- a/libavcodec/012v.c +++ b/libavcodec/012v.c @@ -146,7 +146,7 @@ static int zero12v_decode_frame(AVCodecContext *avctx, AVFrame *pic, const FFCodec ff_zero12v_decoder = { .p.name = "012v", - .p.long_name = NULL_IF_CONFIG_SMALL("Uncompressed 4:2:2 10-bit"), + CODEC_LONG_NAME("Uncompressed 4:2:2 10-bit"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_012V, .init = zero12v_decode_init, diff --git a/libavcodec/4xm.c b/libavcodec/4xm.c index 2ee05766ab..6015fe5299 100644 --- a/libavcodec/4xm.c +++ b/libavcodec/4xm.c @@ -1028,7 +1028,7 @@ static av_cold int decode_init(AVCodecContext *avctx) const FFCodec ff_fourxm_decoder = { .p.name = "4xm", - .p.long_name = NULL_IF_CONFIG_SMALL("4X Movie"), + CODEC_LONG_NAME("4X Movie"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_4XM, .priv_data_size = sizeof(FourXContext), diff --git a/libavcodec/8bps.c b/libavcodec/8bps.c index cda3cdef3a..6870e7a938 100644 --- a/libavcodec/8bps.c +++ b/libavcodec/8bps.c @@ -175,7 +175,7 @@ static av_cold int decode_init(AVCodecContext *avctx) const FFCodec ff_eightbps_decoder = { .p.name = "8bps", - .p.long_name = NULL_IF_CONFIG_SMALL("QuickTime 8BPS video"), + CODEC_LONG_NAME("QuickTime 8BPS video"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_8BPS, .priv_data_size = sizeof(EightBpsContext), diff --git a/libavcodec/8svx.c b/libavcodec/8svx.c index 1c6d78379d..ed635f9ede 100644 --- a/libavcodec/8svx.c +++ b/libavcodec/8svx.c @@ -189,7 +189,7 @@ static av_cold int eightsvx_decode_close(AVCodecContext *avctx) #if CONFIG_EIGHTSVX_FIB_DECODER const FFCodec ff_eightsvx_fib_decoder = { .p.name = "8svx_fib", - .p.long_name = NULL_IF_CONFIG_SMALL("8SVX fibonacci"), + CODEC_LONG_NAME("8SVX fibonacci"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_8SVX_FIB, .priv_data_size = sizeof (EightSvxContext), @@ -204,7 +204,7 @@ const FFCodec ff_eightsvx_fib_decoder = { #if CONFIG_EIGHTSVX_EXP_DECODER const FFCodec ff_eightsvx_exp_decoder = { .p.name = "8svx_exp", - .p.long_name = NULL_IF_CONFIG_SMALL("8SVX exponential"), + CODEC_LONG_NAME("8SVX exponential"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_8SVX_EXP, .priv_data_size = sizeof (EightSvxContext), diff --git a/libavcodec/a64multienc.c b/libavcodec/a64multienc.c index 043ffabd7c..26a9debc22 100644 --- a/libavcodec/a64multienc.c +++ b/libavcodec/a64multienc.c @@ -395,7 +395,7 @@ static int a64multi_encode_frame(AVCodecContext *avctx, AVPacket *pkt, #if CONFIG_A64MULTI_ENCODER const FFCodec ff_a64multi_encoder = { .p.name = "a64multi", - .p.long_name = NULL_IF_CONFIG_SMALL("Multicolor charset for Commodore 64"), + CODEC_LONG_NAME("Multicolor charset for Commodore 64"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_A64_MULTI, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY, @@ -410,7 +410,7 @@ const FFCodec ff_a64multi_encoder = { #if CONFIG_A64MULTI5_ENCODER const FFCodec ff_a64multi5_encoder = { .p.name = "a64multi5", - .p.long_name = NULL_IF_CONFIG_SMALL("Multicolor charset for Commodore 64, extended with 5th color (colram)"), + CODEC_LONG_NAME("Multicolor charset for Commodore 64, extended with 5th color (colram)"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_A64_MULTI5, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY, diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c index c09c3ee547..2d448103df 100644 --- a/libavcodec/aacdec.c +++ b/libavcodec/aacdec.c @@ -554,7 +554,7 @@ static av_cold int latm_decode_init(AVCodecContext *avctx) const FFCodec ff_aac_decoder = { .p.name = "aac", - .p.long_name = NULL_IF_CONFIG_SMALL("AAC (Advanced Audio Coding)"), + CODEC_LONG_NAME("AAC (Advanced Audio Coding)"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_AAC, .priv_data_size = sizeof(AACContext), @@ -582,7 +582,7 @@ const FFCodec ff_aac_decoder = { */ const FFCodec ff_aac_latm_decoder = { .p.name = "aac_latm", - .p.long_name = NULL_IF_CONFIG_SMALL("AAC LATM (Advanced Audio Coding LATM syntax)"), + CODEC_LONG_NAME("AAC LATM (Advanced Audio Coding LATM syntax)"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_AAC_LATM, .priv_data_size = sizeof(struct LATMContext), diff --git a/libavcodec/aacdec_fixed.c b/libavcodec/aacdec_fixed.c index ddfa160adc..4b2085335d 100644 --- a/libavcodec/aacdec_fixed.c +++ b/libavcodec/aacdec_fixed.c @@ -452,7 +452,7 @@ static void apply_independent_coupling_fixed(AACContext *ac, const FFCodec ff_aac_fixed_decoder = { .p.name = "aac_fixed", - .p.long_name = NULL_IF_CONFIG_SMALL("AAC (Advanced Audio Coding)"), + CODEC_LONG_NAME("AAC (Advanced Audio Coding)"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_AAC, .priv_data_size = sizeof(AACContext), diff --git a/libavcodec/aacenc.c b/libavcodec/aacenc.c index a0e5d2942e..6fe738e172 100644 --- a/libavcodec/aacenc.c +++ b/libavcodec/aacenc.c @@ -1414,7 +1414,7 @@ static const FFCodecDefault aac_encode_defaults[] = { const FFCodec ff_aac_encoder = { .p.name = "aac", - .p.long_name = NULL_IF_CONFIG_SMALL("AAC (Advanced Audio Coding)"), + CODEC_LONG_NAME("AAC (Advanced Audio Coding)"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_AAC, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY | diff --git a/libavcodec/aasc.c b/libavcodec/aasc.c index db9fc834b7..c8e15772b1 100644 --- a/libavcodec/aasc.c +++ b/libavcodec/aasc.c @@ -149,7 +149,7 @@ static av_cold int aasc_decode_end(AVCodecContext *avctx) const FFCodec ff_aasc_decoder = { .p.name = "aasc", - .p.long_name = NULL_IF_CONFIG_SMALL("Autodesk RLE"), + CODEC_LONG_NAME("Autodesk RLE"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_AASC, .priv_data_size = sizeof(AascContext), diff --git a/libavcodec/ac3dec_fixed.c b/libavcodec/ac3dec_fixed.c index 29f2acc6f2..0a7ae6cfbf 100644 --- a/libavcodec/ac3dec_fixed.c +++ b/libavcodec/ac3dec_fixed.c @@ -171,7 +171,7 @@ static const AVClass ac3_decoder_class = { const FFCodec ff_ac3_fixed_decoder = { .p.name = "ac3_fixed", - .p.long_name = NULL_IF_CONFIG_SMALL("ATSC A/52A (AC-3)"), + CODEC_LONG_NAME("ATSC A/52A (AC-3)"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_AC3, .p.priv_class = &ac3_decoder_class, diff --git a/libavcodec/ac3dec_float.c b/libavcodec/ac3dec_float.c index 26fbd78d8b..8c1adb3e01 100644 --- a/libavcodec/ac3dec_float.c +++ b/libavcodec/ac3dec_float.c @@ -69,7 +69,7 @@ const FFCodec ff_ac3_decoder = { FF_CODEC_DECODE_CB(ac3_decode_frame), .p.capabilities = AV_CODEC_CAP_CHANNEL_CONF | AV_CODEC_CAP_DR1, - .p.long_name = NULL_IF_CONFIG_SMALL("ATSC A/52A (AC-3)"), + CODEC_LONG_NAME("ATSC A/52A (AC-3)"), .p.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, .p.priv_class = &ac3_eac3_decoder_class, @@ -87,7 +87,7 @@ const FFCodec ff_eac3_decoder = { FF_CODEC_DECODE_CB(ac3_decode_frame), .p.capabilities = AV_CODEC_CAP_CHANNEL_CONF | AV_CODEC_CAP_DR1, - .p.long_name = NULL_IF_CONFIG_SMALL("ATSC A/52B (AC-3, E-AC-3)"), + CODEC_LONG_NAME("ATSC A/52B (AC-3, E-AC-3)"), .p.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, .p.priv_class = &ac3_eac3_decoder_class, diff --git a/libavcodec/ac3enc_fixed.c b/libavcodec/ac3enc_fixed.c index fe434afc26..a22d3b4abf 100644 --- a/libavcodec/ac3enc_fixed.c +++ b/libavcodec/ac3enc_fixed.c @@ -122,7 +122,7 @@ static av_cold int ac3_fixed_encode_init(AVCodecContext *avctx) FF_DISABLE_DEPRECATION_WARNINGS const FFCodec ff_ac3_fixed_encoder = { .p.name = "ac3_fixed", - .p.long_name = NULL_IF_CONFIG_SMALL("ATSC A/52A (AC-3)"), + CODEC_LONG_NAME("ATSC A/52A (AC-3)"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_AC3, .p.capabilities = AV_CODEC_CAP_DR1, diff --git a/libavcodec/ac3enc_float.c b/libavcodec/ac3enc_float.c index 666b53708b..6238980690 100644 --- a/libavcodec/ac3enc_float.c +++ b/libavcodec/ac3enc_float.c @@ -126,7 +126,7 @@ av_cold int ff_ac3_float_encode_init(AVCodecContext *avctx) FF_DISABLE_DEPRECATION_WARNINGS const FFCodec ff_ac3_encoder = { .p.name = "ac3", - .p.long_name = NULL_IF_CONFIG_SMALL("ATSC A/52A (AC-3)"), + CODEC_LONG_NAME("ATSC A/52A (AC-3)"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_AC3, .p.capabilities = AV_CODEC_CAP_DR1, diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c index 5db46752ab..841538b138 100644 --- a/libavcodec/adpcm.c +++ b/libavcodec/adpcm.c @@ -2287,7 +2287,7 @@ static const enum AVSampleFormat sample_fmts_both[] = { AV_SAMPLE_FMT_S16, #define ADPCM_DECODER_1(id_, sample_fmts_, name_, long_name_) \ const FFCodec ff_ ## name_ ## _decoder = { \ .p.name = #name_, \ - .p.long_name = NULL_IF_CONFIG_SMALL(long_name_), \ + CODEC_LONG_NAME(long_name_), \ .p.type = AVMEDIA_TYPE_AUDIO, \ .p.id = id_, \ .p.capabilities = AV_CODEC_CAP_DR1, \ diff --git a/libavcodec/adpcmenc.c b/libavcodec/adpcmenc.c index e27febfd74..1ffc5b410f 100644 --- a/libavcodec/adpcmenc.c +++ b/libavcodec/adpcmenc.c @@ -998,7 +998,7 @@ static const AVClass adpcm_encoder_class = { #define ADPCM_ENCODER_1(id_, name_, sample_fmts_, capabilities_, long_name_) \ const FFCodec ff_ ## name_ ## _encoder = { \ .p.name = #name_, \ - .p.long_name = NULL_IF_CONFIG_SMALL(long_name_), \ + CODEC_LONG_NAME(long_name_), \ .p.type = AVMEDIA_TYPE_AUDIO, \ .p.id = id_, \ .p.sample_fmts = sample_fmts_, \ diff --git a/libavcodec/adxdec.c b/libavcodec/adxdec.c index cdded477ca..a2701608ff 100644 --- a/libavcodec/adxdec.c +++ b/libavcodec/adxdec.c @@ -192,7 +192,7 @@ static void adx_decode_flush(AVCodecContext *avctx) const FFCodec ff_adpcm_adx_decoder = { .p.name = "adpcm_adx", - .p.long_name = NULL_IF_CONFIG_SMALL("SEGA CRI ADX ADPCM"), + CODEC_LONG_NAME("SEGA CRI ADX ADPCM"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_ADPCM_ADX, .priv_data_size = sizeof(ADXContext), diff --git a/libavcodec/adxenc.c b/libavcodec/adxenc.c index 0a2e5092cd..153c91b852 100644 --- a/libavcodec/adxenc.c +++ b/libavcodec/adxenc.c @@ -191,7 +191,7 @@ static int adx_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, const FFCodec ff_adpcm_adx_encoder = { .p.name = "adpcm_adx", - .p.long_name = NULL_IF_CONFIG_SMALL("SEGA CRI ADX ADPCM"), + CODEC_LONG_NAME("SEGA CRI ADX ADPCM"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_ADPCM_ADX, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY, diff --git a/libavcodec/agm.c b/libavcodec/agm.c index 38d9c67f80..017aa0e1fa 100644 --- a/libavcodec/agm.c +++ b/libavcodec/agm.c @@ -1285,7 +1285,7 @@ static av_cold int decode_close(AVCodecContext *avctx) const FFCodec ff_agm_decoder = { .p.name = "agm", - .p.long_name = NULL_IF_CONFIG_SMALL("Amuse Graphics Movie"), + CODEC_LONG_NAME("Amuse Graphics Movie"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_AGM, .p.capabilities = AV_CODEC_CAP_DR1, diff --git a/libavcodec/aic.c b/libavcodec/aic.c index 21ce778146..49d08f0556 100644 --- a/libavcodec/aic.c +++ b/libavcodec/aic.c @@ -497,7 +497,7 @@ static av_cold int aic_decode_close(AVCodecContext *avctx) const FFCodec ff_aic_decoder = { .p.name = "aic", - .p.long_name = NULL_IF_CONFIG_SMALL("Apple Intermediate Codec"), + CODEC_LONG_NAME("Apple Intermediate Codec"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_AIC, .priv_data_size = sizeof(AICContext), diff --git a/libavcodec/alac.c b/libavcodec/alac.c index 8b87d78dd3..d10ecba7e6 100644 --- a/libavcodec/alac.c +++ b/libavcodec/alac.c @@ -614,7 +614,7 @@ static const AVClass alac_class = { const FFCodec ff_alac_decoder = { .p.name = "alac", - .p.long_name = NULL_IF_CONFIG_SMALL("ALAC (Apple Lossless Audio Codec)"), + CODEC_LONG_NAME("ALAC (Apple Lossless Audio Codec)"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_ALAC, .priv_data_size = sizeof(ALACContext), diff --git a/libavcodec/alacenc.c b/libavcodec/alacenc.c index 20711d242f..362d4f8ba6 100644 --- a/libavcodec/alacenc.c +++ b/libavcodec/alacenc.c @@ -651,7 +651,7 @@ static const AVClass alacenc_class = { FF_DISABLE_DEPRECATION_WARNINGS const FFCodec ff_alac_encoder = { .p.name = "alac", - .p.long_name = NULL_IF_CONFIG_SMALL("ALAC (Apple Lossless Audio Codec)"), + CODEC_LONG_NAME("ALAC (Apple Lossless Audio Codec)"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_ALAC, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_SMALL_LAST_FRAME, diff --git a/libavcodec/aliaspixdec.c b/libavcodec/aliaspixdec.c index 7dedfe3aa1..45155d79cd 100644 --- a/libavcodec/aliaspixdec.c +++ b/libavcodec/aliaspixdec.c @@ -123,7 +123,7 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *f, const FFCodec ff_alias_pix_decoder = { .p.name = "alias_pix", - .p.long_name = NULL_IF_CONFIG_SMALL("Alias/Wavefront PIX image"), + CODEC_LONG_NAME("Alias/Wavefront PIX image"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_ALIAS_PIX, .p.capabilities = AV_CODEC_CAP_DR1, diff --git a/libavcodec/aliaspixenc.c b/libavcodec/aliaspixenc.c index ec1cba9a57..6593d3f047 100644 --- a/libavcodec/aliaspixenc.c +++ b/libavcodec/aliaspixenc.c @@ -103,7 +103,7 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, const FFCodec ff_alias_pix_encoder = { .p.name = "alias_pix", - .p.long_name = NULL_IF_CONFIG_SMALL("Alias/Wavefront PIX image"), + CODEC_LONG_NAME("Alias/Wavefront PIX image"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_ALIAS_PIX, .p.capabilities = AV_CODEC_CAP_DR1, diff --git a/libavcodec/alsdec.c b/libavcodec/alsdec.c index 4bb232c42a..17937ad928 100644 --- a/libavcodec/alsdec.c +++ b/libavcodec/alsdec.c @@ -2181,7 +2181,7 @@ static av_cold void flush(AVCodecContext *avctx) const FFCodec ff_als_decoder = { .p.name = "als", - .p.long_name = NULL_IF_CONFIG_SMALL("MPEG-4 Audio Lossless Coding (ALS)"), + CODEC_LONG_NAME("MPEG-4 Audio Lossless Coding (ALS)"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_MP4ALS, .priv_data_size = sizeof(ALSDecContext), diff --git a/libavcodec/amfenc_h264.c b/libavcodec/amfenc_h264.c index eba8c23cdd..eaf7f974f3 100644 --- a/libavcodec/amfenc_h264.c +++ b/libavcodec/amfenc_h264.c @@ -380,7 +380,7 @@ static const AVClass h264_amf_class = { const FFCodec ff_h264_amf_encoder = { .p.name = "h264_amf", - .p.long_name = NULL_IF_CONFIG_SMALL("AMD AMF H.264 Encoder"), + CODEC_LONG_NAME("AMD AMF H.264 Encoder"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_H264, .init = amf_encode_init_h264, diff --git a/libavcodec/amfenc_hevc.c b/libavcodec/amfenc_hevc.c index 5aaaa83e39..9b46946f1e 100644 --- a/libavcodec/amfenc_hevc.c +++ b/libavcodec/amfenc_hevc.c @@ -312,7 +312,7 @@ static const AVClass hevc_amf_class = { const FFCodec ff_hevc_amf_encoder = { .p.name = "hevc_amf", - .p.long_name = NULL_IF_CONFIG_SMALL("AMD AMF HEVC encoder"), + CODEC_LONG_NAME("AMD AMF HEVC encoder"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_HEVC, .init = amf_encode_init_hevc, diff --git a/libavcodec/amrnbdec.c b/libavcodec/amrnbdec.c index e07c01923e..bfdcbba778 100644 --- a/libavcodec/amrnbdec.c +++ b/libavcodec/amrnbdec.c @@ -1097,7 +1097,7 @@ static int amrnb_decode_frame(AVCodecContext *avctx, AVFrame *frame, const FFCodec ff_amrnb_decoder = { .p.name = "amrnb", - .p.long_name = NULL_IF_CONFIG_SMALL("AMR-NB (Adaptive Multi-Rate NarrowBand)"), + CODEC_LONG_NAME("AMR-NB (Adaptive Multi-Rate NarrowBand)"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_AMR_NB, .priv_data_size = sizeof(AMRChannelsContext), diff --git a/libavcodec/amrwbdec.c b/libavcodec/amrwbdec.c index 1e537e1a3b..ea3812cd9a 100644 --- a/libavcodec/amrwbdec.c +++ b/libavcodec/amrwbdec.c @@ -1293,7 +1293,7 @@ static int amrwb_decode_frame(AVCodecContext *avctx, AVFrame *frame, const FFCodec ff_amrwb_decoder = { .p.name = "amrwb", - .p.long_name = NULL_IF_CONFIG_SMALL("AMR-WB (Adaptive Multi-Rate WideBand)"), + CODEC_LONG_NAME("AMR-WB (Adaptive Multi-Rate WideBand)"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_AMR_WB, .priv_data_size = sizeof(AMRWBChannelsContext), diff --git a/libavcodec/anm.c b/libavcodec/anm.c index c7256fe6d3..4aabe853b4 100644 --- a/libavcodec/anm.c +++ b/libavcodec/anm.c @@ -191,7 +191,7 @@ static av_cold int decode_end(AVCodecContext *avctx) const FFCodec ff_anm_decoder = { .p.name = "anm", - .p.long_name = NULL_IF_CONFIG_SMALL("Deluxe Paint Animation"), + CODEC_LONG_NAME("Deluxe Paint Animation"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_ANM, .priv_data_size = sizeof(AnmContext), diff --git a/libavcodec/ansi.c b/libavcodec/ansi.c index 89bde59b40..e15c1bb097 100644 --- a/libavcodec/ansi.c +++ b/libavcodec/ansi.c @@ -481,7 +481,7 @@ static const FFCodecDefault ansi_defaults[] = { const FFCodec ff_ansi_decoder = { .p.name = "ansi", - .p.long_name = NULL_IF_CONFIG_SMALL("ASCII/ANSI art"), + CODEC_LONG_NAME("ASCII/ANSI art"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_ANSI, .priv_data_size = sizeof(AnsiContext), diff --git a/libavcodec/apedec.c b/libavcodec/apedec.c index 805b9af3c3..4e3ddfea01 100644 --- a/libavcodec/apedec.c +++ b/libavcodec/apedec.c @@ -1659,7 +1659,7 @@ static const AVClass ape_decoder_class = { const FFCodec ff_ape_decoder = { .p.name = "ape", - .p.long_name = NULL_IF_CONFIG_SMALL("Monkey's Audio"), + CODEC_LONG_NAME("Monkey's Audio"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_APE, .priv_data_size = sizeof(APEContext), diff --git a/libavcodec/aptxdec.c b/libavcodec/aptxdec.c index 1d7a7842f7..878c9ffe1b 100644 --- a/libavcodec/aptxdec.c +++ b/libavcodec/aptxdec.c @@ -176,7 +176,7 @@ static int aptx_decode_frame(AVCodecContext *avctx, AVFrame *frame, #if CONFIG_APTX_DECODER const FFCodec ff_aptx_decoder = { .p.name = "aptx", - .p.long_name = NULL_IF_CONFIG_SMALL("aptX (Audio Processing Technology for Bluetooth)"), + CODEC_LONG_NAME("aptX (Audio Processing Technology for Bluetooth)"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_APTX, .priv_data_size = sizeof(AptXContext), @@ -195,7 +195,7 @@ const FFCodec ff_aptx_decoder = { #if CONFIG_APTX_HD_DECODER const FFCodec ff_aptx_hd_decoder = { .p.name = "aptx_hd", - .p.long_name = NULL_IF_CONFIG_SMALL("aptX HD (Audio Processing Technology for Bluetooth)"), + CODEC_LONG_NAME("aptX HD (Audio Processing Technology for Bluetooth)"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_APTX_HD, .priv_data_size = sizeof(AptXContext), diff --git a/libavcodec/aptxenc.c b/libavcodec/aptxenc.c index 2a0d8e06eb..f9347853d2 100644 --- a/libavcodec/aptxenc.c +++ b/libavcodec/aptxenc.c @@ -263,7 +263,7 @@ static av_cold int aptx_encode_init(AVCodecContext *avctx) #if CONFIG_APTX_ENCODER const FFCodec ff_aptx_encoder = { .p.name = "aptx", - .p.long_name = NULL_IF_CONFIG_SMALL("aptX (Audio Processing Technology for Bluetooth)"), + CODEC_LONG_NAME("aptX (Audio Processing Technology for Bluetooth)"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_APTX, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_SMALL_LAST_FRAME, @@ -284,7 +284,7 @@ const FFCodec ff_aptx_encoder = { #if CONFIG_APTX_HD_ENCODER const FFCodec ff_aptx_hd_encoder = { .p.name = "aptx_hd", - .p.long_name = NULL_IF_CONFIG_SMALL("aptX HD (Audio Processing Technology for Bluetooth)"), + CODEC_LONG_NAME("aptX HD (Audio Processing Technology for Bluetooth)"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_APTX_HD, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_SMALL_LAST_FRAME, diff --git a/libavcodec/arbc.c b/libavcodec/arbc.c index 7155d65196..343c56695e 100644 --- a/libavcodec/arbc.c +++ b/libavcodec/arbc.c @@ -208,7 +208,7 @@ static av_cold int decode_close(AVCodecContext *avctx) const FFCodec ff_arbc_decoder = { .p.name = "arbc", - .p.long_name = NULL_IF_CONFIG_SMALL("Gryphon's Anim Compressor"), + CODEC_LONG_NAME("Gryphon's Anim Compressor"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_ARBC, .priv_data_size = sizeof(ARBCContext), diff --git a/libavcodec/argo.c b/libavcodec/argo.c index a863373af2..9bedb1394d 100644 --- a/libavcodec/argo.c +++ b/libavcodec/argo.c @@ -732,7 +732,7 @@ static av_cold int decode_close(AVCodecContext *avctx) const FFCodec ff_argo_decoder = { .p.name = "argo", - .p.long_name = NULL_IF_CONFIG_SMALL("Argonaut Games Video"), + CODEC_LONG_NAME("Argonaut Games Video"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_ARGO, .priv_data_size = sizeof(ArgoContext), diff --git a/libavcodec/assdec.c b/libavcodec/assdec.c index b189645545..89d7b51894 100644 --- a/libavcodec/assdec.c +++ b/libavcodec/assdec.c @@ -64,7 +64,7 @@ static int ass_decode_frame(AVCodecContext *avctx, AVSubtitle *sub, #if CONFIG_SSA_DECODER const FFCodec ff_ssa_decoder = { .p.name = "ssa", - .p.long_name = NULL_IF_CONFIG_SMALL("ASS (Advanced SubStation Alpha) subtitle"), + CODEC_LONG_NAME("ASS (Advanced SubStation Alpha) subtitle"), .p.type = AVMEDIA_TYPE_SUBTITLE, .p.id = AV_CODEC_ID_ASS, .init = ass_decode_init, @@ -75,7 +75,7 @@ const FFCodec ff_ssa_decoder = { #if CONFIG_ASS_DECODER const FFCodec ff_ass_decoder = { .p.name = "ass", - .p.long_name = NULL_IF_CONFIG_SMALL("ASS (Advanced SubStation Alpha) subtitle"), + CODEC_LONG_NAME("ASS (Advanced SubStation Alpha) subtitle"), .p.type = AVMEDIA_TYPE_SUBTITLE, .p.id = AV_CODEC_ID_ASS, .init = ass_decode_init, diff --git a/libavcodec/assenc.c b/libavcodec/assenc.c index b024b1b0ed..db6fd25dd7 100644 --- a/libavcodec/assenc.c +++ b/libavcodec/assenc.c @@ -71,7 +71,7 @@ static int ass_encode_frame(AVCodecContext *avctx, #if CONFIG_SSA_ENCODER const FFCodec ff_ssa_encoder = { .p.name = "ssa", - .p.long_name = NULL_IF_CONFIG_SMALL("ASS (Advanced SubStation Alpha) subtitle"), + CODEC_LONG_NAME("ASS (Advanced SubStation Alpha) subtitle"), .p.type = AVMEDIA_TYPE_SUBTITLE, .p.id = AV_CODEC_ID_ASS, .init = ass_encode_init, @@ -82,7 +82,7 @@ const FFCodec ff_ssa_encoder = { #if CONFIG_ASS_ENCODER const FFCodec ff_ass_encoder = { .p.name = "ass", - .p.long_name = NULL_IF_CONFIG_SMALL("ASS (Advanced SubStation Alpha) subtitle"), + CODEC_LONG_NAME("ASS (Advanced SubStation Alpha) subtitle"), .p.type = AVMEDIA_TYPE_SUBTITLE, .p.id = AV_CODEC_ID_ASS, .init = ass_encode_init, diff --git a/libavcodec/asvdec.c b/libavcodec/asvdec.c index 2105d55e33..c8c50cc8d4 100644 --- a/libavcodec/asvdec.c +++ b/libavcodec/asvdec.c @@ -330,7 +330,7 @@ static av_cold int decode_end(AVCodecContext *avctx) #if CONFIG_ASV1_DECODER const FFCodec ff_asv1_decoder = { .p.name = "asv1", - .p.long_name = NULL_IF_CONFIG_SMALL("ASUS V1"), + CODEC_LONG_NAME("ASUS V1"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_ASV1, .priv_data_size = sizeof(ASV1Context), @@ -344,7 +344,7 @@ const FFCodec ff_asv1_decoder = { #if CONFIG_ASV2_DECODER const FFCodec ff_asv2_decoder = { .p.name = "asv2", - .p.long_name = NULL_IF_CONFIG_SMALL("ASUS V2"), + CODEC_LONG_NAME("ASUS V2"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_ASV2, .priv_data_size = sizeof(ASV1Context), diff --git a/libavcodec/asvenc.c b/libavcodec/asvenc.c index 4f14cbdb64..25ea96e64e 100644 --- a/libavcodec/asvenc.c +++ b/libavcodec/asvenc.c @@ -345,7 +345,7 @@ static av_cold int encode_init(AVCodecContext *avctx) #if CONFIG_ASV1_ENCODER const FFCodec ff_asv1_encoder = { .p.name = "asv1", - .p.long_name = NULL_IF_CONFIG_SMALL("ASUS V1"), + CODEC_LONG_NAME("ASUS V1"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_ASV1, .p.capabilities = AV_CODEC_CAP_DR1, @@ -360,7 +360,7 @@ const FFCodec ff_asv1_encoder = { #if CONFIG_ASV2_ENCODER const FFCodec ff_asv2_encoder = { .p.name = "asv2", - .p.long_name = NULL_IF_CONFIG_SMALL("ASUS V2"), + CODEC_LONG_NAME("ASUS V2"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_ASV2, .p.capabilities = AV_CODEC_CAP_DR1, diff --git a/libavcodec/atrac1.c b/libavcodec/atrac1.c index 3b60cee259..fb83449c16 100644 --- a/libavcodec/atrac1.c +++ b/libavcodec/atrac1.c @@ -384,7 +384,7 @@ static av_cold int atrac1_decode_init(AVCodecContext *avctx) const FFCodec ff_atrac1_decoder = { .p.name = "atrac1", - .p.long_name = NULL_IF_CONFIG_SMALL("ATRAC1 (Adaptive TRansform Acoustic Coding)"), + CODEC_LONG_NAME("ATRAC1 (Adaptive TRansform Acoustic Coding)"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_ATRAC1, .priv_data_size = sizeof(AT1Ctx), diff --git a/libavcodec/atrac3.c b/libavcodec/atrac3.c index 79260c8760..12ba55d34d 100644 --- a/libavcodec/atrac3.c +++ b/libavcodec/atrac3.c @@ -1016,7 +1016,7 @@ static av_cold int atrac3_decode_init(AVCodecContext *avctx) const FFCodec ff_atrac3_decoder = { .p.name = "atrac3", - .p.long_name = NULL_IF_CONFIG_SMALL("ATRAC3 (Adaptive TRansform Acoustic Coding 3)"), + CODEC_LONG_NAME("ATRAC3 (Adaptive TRansform Acoustic Coding 3)"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_ATRAC3, .priv_data_size = sizeof(ATRAC3Context), @@ -1031,7 +1031,7 @@ const FFCodec ff_atrac3_decoder = { const FFCodec ff_atrac3al_decoder = { .p.name = "atrac3al", - .p.long_name = NULL_IF_CONFIG_SMALL("ATRAC3 AL (Adaptive TRansform Acoustic Coding 3 Advanced Lossless)"), + CODEC_LONG_NAME("ATRAC3 AL (Adaptive TRansform Acoustic Coding 3 Advanced Lossless)"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_ATRAC3AL, .priv_data_size = sizeof(ATRAC3Context), diff --git a/libavcodec/atrac3plusdec.c b/libavcodec/atrac3plusdec.c index 771c213bad..ee71645a3c 100644 --- a/libavcodec/atrac3plusdec.c +++ b/libavcodec/atrac3plusdec.c @@ -392,7 +392,7 @@ static int atrac3p_decode_frame(AVCodecContext *avctx, AVFrame *frame, const FFCodec ff_atrac3p_decoder = { .p.name = "atrac3plus", - .p.long_name = NULL_IF_CONFIG_SMALL("ATRAC3+ (Adaptive TRansform Acoustic Coding 3+)"), + CODEC_LONG_NAME("ATRAC3+ (Adaptive TRansform Acoustic Coding 3+)"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_ATRAC3P, .p.capabilities = AV_CODEC_CAP_DR1, @@ -405,7 +405,7 @@ const FFCodec ff_atrac3p_decoder = { const FFCodec ff_atrac3pal_decoder = { .p.name = "atrac3plusal", - .p.long_name = NULL_IF_CONFIG_SMALL("ATRAC3+ AL (Adaptive TRansform Acoustic Coding 3+ Advanced Lossless)"), + CODEC_LONG_NAME("ATRAC3+ AL (Adaptive TRansform Acoustic Coding 3+ Advanced Lossless)"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_ATRAC3PAL, .p.capabilities = AV_CODEC_CAP_DR1, diff --git a/libavcodec/atrac9dec.c b/libavcodec/atrac9dec.c index 71ff6e0151..d3a5d05799 100644 --- a/libavcodec/atrac9dec.c +++ b/libavcodec/atrac9dec.c @@ -989,7 +989,7 @@ static av_cold int atrac9_decode_init(AVCodecContext *avctx) const FFCodec ff_atrac9_decoder = { .p.name = "atrac9", - .p.long_name = NULL_IF_CONFIG_SMALL("ATRAC9 (Adaptive TRansform Acoustic Coding 9)"), + CODEC_LONG_NAME("ATRAC9 (Adaptive TRansform Acoustic Coding 9)"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_ATRAC9, .priv_data_size = sizeof(ATRAC9Context), diff --git a/libavcodec/audiotoolboxdec.c b/libavcodec/audiotoolboxdec.c index 220101e9eb..82babe3d31 100644 --- a/libavcodec/audiotoolboxdec.c +++ b/libavcodec/audiotoolboxdec.c @@ -591,7 +591,7 @@ static av_cold int ffat_close_decoder(AVCodecContext *avctx) FFAT_DEC_CLASS(NAME) \ const FFCodec ff_##NAME##_at_decoder = { \ .p.name = #NAME "_at", \ - .p.long_name = NULL_IF_CONFIG_SMALL(#NAME " (AudioToolbox)"), \ + CODEC_LONG_NAME(#NAME " (AudioToolbox)"), \ .p.type = AVMEDIA_TYPE_AUDIO, \ .p.id = ID, \ .priv_data_size = sizeof(ATDecodeContext), \ diff --git a/libavcodec/audiotoolboxenc.c b/libavcodec/audiotoolboxenc.c index 7cb7ab6e7e..02a863bf03 100644 --- a/libavcodec/audiotoolboxenc.c +++ b/libavcodec/audiotoolboxenc.c @@ -616,7 +616,7 @@ static const AVOption options[] = { FFAT_ENC_CLASS(NAME) \ const FFCodec ff_##NAME##_at_encoder = { \ .p.name = #NAME "_at", \ - .p.long_name = NULL_IF_CONFIG_SMALL(#NAME " (AudioToolbox)"), \ + CODEC_LONG_NAME(#NAME " (AudioToolbox)"), \ .p.type = AVMEDIA_TYPE_AUDIO, \ .p.id = ID, \ .priv_data_size = sizeof(ATDecodeContext), \ diff --git a/libavcodec/aura.c b/libavcodec/aura.c index 938706629d..78914fe9f2 100644 --- a/libavcodec/aura.c +++ b/libavcodec/aura.c @@ -98,7 +98,7 @@ static int aura_decode_frame(AVCodecContext *avctx, AVFrame *frame, const FFCodec ff_aura2_decoder = { .p.name = "aura2", - .p.long_name = NULL_IF_CONFIG_SMALL("Auravision Aura 2"), + CODEC_LONG_NAME("Auravision Aura 2"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_AURA2, .init = aura_decode_init, diff --git a/libavcodec/av1dec.c b/libavcodec/av1dec.c index 401462701f..0c24eac842 100644 --- a/libavcodec/av1dec.c +++ b/libavcodec/av1dec.c @@ -1247,7 +1247,7 @@ static const AVClass av1_class = { const FFCodec ff_av1_decoder = { .p.name = "av1", - .p.long_name = NULL_IF_CONFIG_SMALL("Alliance for Open Media AV1"), + CODEC_LONG_NAME("Alliance for Open Media AV1"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_AV1, .priv_data_size = sizeof(AV1DecContext), diff --git a/libavcodec/avrndec.c b/libavcodec/avrndec.c index f0257cd860..ef194058fc 100644 --- a/libavcodec/avrndec.c +++ b/libavcodec/avrndec.c @@ -91,7 +91,7 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *p, const FFCodec ff_avrn_decoder = { .p.name = "avrn", - .p.long_name = NULL_IF_CONFIG_SMALL("Avid AVI Codec"), + CODEC_LONG_NAME("Avid AVI Codec"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_AVRN, .priv_data_size = sizeof(AVRnContext), diff --git a/libavcodec/avs.c b/libavcodec/avs.c index ca2b2d4701..a1c9d3c436 100644 --- a/libavcodec/avs.c +++ b/libavcodec/avs.c @@ -177,7 +177,7 @@ static av_cold int avs_decode_end(AVCodecContext *avctx) const FFCodec ff_avs_decoder = { .p.name = "avs", - .p.long_name = NULL_IF_CONFIG_SMALL("AVS (Audio Video Standard) video"), + CODEC_LONG_NAME("AVS (Audio Video Standard) video"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_AVS, .priv_data_size = sizeof(AvsContext), diff --git a/libavcodec/avuidec.c b/libavcodec/avuidec.c index 9e698b02ec..ba157e167c 100644 --- a/libavcodec/avuidec.c +++ b/libavcodec/avuidec.c @@ -121,7 +121,7 @@ static int avui_decode_frame(AVCodecContext *avctx, AVFrame *pic, const FFCodec ff_avui_decoder = { .p.name = "avui", - .p.long_name = NULL_IF_CONFIG_SMALL("Avid Meridien Uncompressed"), + CODEC_LONG_NAME("Avid Meridien Uncompressed"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_AVUI, .p.capabilities = AV_CODEC_CAP_DR1, diff --git a/libavcodec/avuienc.c b/libavcodec/avuienc.c index 0357e682a9..0b82848cb3 100644 --- a/libavcodec/avuienc.c +++ b/libavcodec/avuienc.c @@ -93,7 +93,7 @@ static int avui_encode_frame(AVCodecContext *avctx, AVPacket *pkt, const FFCodec ff_avui_encoder = { .p.name = "avui", - .p.long_name = NULL_IF_CONFIG_SMALL("Avid Meridien Uncompressed"), + CODEC_LONG_NAME("Avid Meridien Uncompressed"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_AVUI, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_EXPERIMENTAL, diff --git a/libavcodec/bethsoftvideo.c b/libavcodec/bethsoftvideo.c index 4562053829..e095d04fa5 100644 --- a/libavcodec/bethsoftvideo.c +++ b/libavcodec/bethsoftvideo.c @@ -165,7 +165,7 @@ static av_cold int bethsoftvid_decode_end(AVCodecContext *avctx) const FFCodec ff_bethsoftvid_decoder = { .p.name = "bethsoftvid", - .p.long_name = NULL_IF_CONFIG_SMALL("Bethesda VID video"), + CODEC_LONG_NAME("Bethesda VID video"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_BETHSOFTVID, .priv_data_size = sizeof(BethsoftvidContext), diff --git a/libavcodec/bfi.c b/libavcodec/bfi.c index 9df5bcdf5e..2b647419c7 100644 --- a/libavcodec/bfi.c +++ b/libavcodec/bfi.c @@ -177,7 +177,7 @@ static av_cold int bfi_decode_close(AVCodecContext *avctx) const FFCodec ff_bfi_decoder = { .p.name = "bfi", - .p.long_name = NULL_IF_CONFIG_SMALL("Brute Force & Ignorance"), + CODEC_LONG_NAME("Brute Force & Ignorance"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_BFI, .priv_data_size = sizeof(BFIContext), diff --git a/libavcodec/bink.c b/libavcodec/bink.c index c1960484d6..e43ff1f4fa 100644 --- a/libavcodec/bink.c +++ b/libavcodec/bink.c @@ -1420,7 +1420,7 @@ static void flush(AVCodecContext *avctx) const FFCodec ff_bink_decoder = { .p.name = "binkvideo", - .p.long_name = NULL_IF_CONFIG_SMALL("Bink video"), + CODEC_LONG_NAME("Bink video"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_BINKVIDEO, .priv_data_size = sizeof(BinkContext), diff --git a/libavcodec/binkaudio.c b/libavcodec/binkaudio.c index 372c439691..43dca1f565 100644 --- a/libavcodec/binkaudio.c +++ b/libavcodec/binkaudio.c @@ -367,7 +367,7 @@ static void decode_flush(AVCodecContext *avctx) const FFCodec ff_binkaudio_rdft_decoder = { .p.name = "binkaudio_rdft", - .p.long_name = NULL_IF_CONFIG_SMALL("Bink Audio (RDFT)"), + CODEC_LONG_NAME("Bink Audio (RDFT)"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_BINKAUDIO_RDFT, .priv_data_size = sizeof(BinkAudioContext), @@ -381,7 +381,7 @@ const FFCodec ff_binkaudio_rdft_decoder = { const FFCodec ff_binkaudio_dct_decoder = { .p.name = "binkaudio_dct", - .p.long_name = NULL_IF_CONFIG_SMALL("Bink Audio (DCT)"), + CODEC_LONG_NAME("Bink Audio (DCT)"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_BINKAUDIO_DCT, .priv_data_size = sizeof(BinkAudioContext), diff --git a/libavcodec/bintext.c b/libavcodec/bintext.c index c3cf14f6dd..ce814f7693 100644 --- a/libavcodec/bintext.c +++ b/libavcodec/bintext.c @@ -219,7 +219,7 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *frame, #if CONFIG_BINTEXT_DECODER const FFCodec ff_bintext_decoder = { .p.name = "bintext", - .p.long_name = NULL_IF_CONFIG_SMALL("Binary text"), + CODEC_LONG_NAME("Binary text"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_BINTEXT, .priv_data_size = sizeof(XbinContext), @@ -231,7 +231,7 @@ const FFCodec ff_bintext_decoder = { #if CONFIG_XBIN_DECODER const FFCodec ff_xbin_decoder = { .p.name = "xbin", - .p.long_name = NULL_IF_CONFIG_SMALL("eXtended BINary text"), + CODEC_LONG_NAME("eXtended BINary text"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_XBIN, .priv_data_size = sizeof(XbinContext), @@ -243,7 +243,7 @@ const FFCodec ff_xbin_decoder = { #if CONFIG_IDF_DECODER const FFCodec ff_idf_decoder = { .p.name = "idf", - .p.long_name = NULL_IF_CONFIG_SMALL("iCEDraw text"), + CODEC_LONG_NAME("iCEDraw text"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_IDF, .priv_data_size = sizeof(XbinContext), diff --git a/libavcodec/bitpacked_dec.c b/libavcodec/bitpacked_dec.c index 8a375fe08b..a1ffef185c 100644 --- a/libavcodec/bitpacked_dec.c +++ b/libavcodec/bitpacked_dec.c @@ -143,7 +143,7 @@ static int bitpacked_decode(AVCodecContext *avctx, AVFrame *frame, const FFCodec ff_bitpacked_decoder = { .p.name = "bitpacked", - .p.long_name = NULL_IF_CONFIG_SMALL("Bitpacked"), + CODEC_LONG_NAME("Bitpacked"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_BITPACKED, .p.capabilities = AV_CODEC_CAP_FRAME_THREADS, diff --git a/libavcodec/bitpacked_enc.c b/libavcodec/bitpacked_enc.c index f3ddbb2a88..ca4d5c887d 100644 --- a/libavcodec/bitpacked_enc.c +++ b/libavcodec/bitpacked_enc.c @@ -106,7 +106,7 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, const FFCodec ff_bitpacked_encoder = { .p.name = "bitpacked", - .p.long_name = NULL_IF_CONFIG_SMALL("Bitpacked"), + CODEC_LONG_NAME("Bitpacked"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_BITPACKED, .priv_data_size = sizeof(struct BitpackedContext), diff --git a/libavcodec/bmp.c b/libavcodec/bmp.c index d381eb2eee..d7e01f0725 100644 --- a/libavcodec/bmp.c +++ b/libavcodec/bmp.c @@ -366,7 +366,7 @@ static int bmp_decode_frame(AVCodecContext *avctx, AVFrame *p, const FFCodec ff_bmp_decoder = { .p.name = "bmp", - .p.long_name = NULL_IF_CONFIG_SMALL("BMP (Windows and OS/2 bitmap)"), + CODEC_LONG_NAME("BMP (Windows and OS/2 bitmap)"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_BMP, .p.capabilities = AV_CODEC_CAP_DR1, diff --git a/libavcodec/bmpenc.c b/libavcodec/bmpenc.c index 964f7cc2ad..abf644bd99 100644 --- a/libavcodec/bmpenc.c +++ b/libavcodec/bmpenc.c @@ -158,7 +158,7 @@ static int bmp_encode_frame(AVCodecContext *avctx, AVPacket *pkt, const FFCodec ff_bmp_encoder = { .p.name = "bmp", - .p.long_name = NULL_IF_CONFIG_SMALL("BMP (Windows and OS/2 bitmap)"), + CODEC_LONG_NAME("BMP (Windows and OS/2 bitmap)"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_BMP, .p.capabilities = AV_CODEC_CAP_DR1, diff --git a/libavcodec/bmvaudio.c b/libavcodec/bmvaudio.c index d772f72d71..fc211732bb 100644 --- a/libavcodec/bmvaudio.c +++ b/libavcodec/bmvaudio.c @@ -80,7 +80,7 @@ static int bmv_aud_decode_frame(AVCodecContext *avctx, AVFrame *frame, const FFCodec ff_bmv_audio_decoder = { .p.name = "bmv_audio", - .p.long_name = NULL_IF_CONFIG_SMALL("Discworld II BMV audio"), + CODEC_LONG_NAME("Discworld II BMV audio"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_BMV_AUDIO, .init = bmv_aud_decode_init, diff --git a/libavcodec/bmvvideo.c b/libavcodec/bmvvideo.c index 6a55d49494..92ce41c836 100644 --- a/libavcodec/bmvvideo.c +++ b/libavcodec/bmvvideo.c @@ -287,7 +287,7 @@ static av_cold int decode_init(AVCodecContext *avctx) const FFCodec ff_bmv_video_decoder = { .p.name = "bmv_video", - .p.long_name = NULL_IF_CONFIG_SMALL("Discworld II BMV video"), + CODEC_LONG_NAME("Discworld II BMV video"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_BMV_VIDEO, .priv_data_size = sizeof(BMVDecContext), diff --git a/libavcodec/brenderpix.c b/libavcodec/brenderpix.c index 170acc39a3..e95ab3d4af 100644 --- a/libavcodec/brenderpix.c +++ b/libavcodec/brenderpix.c @@ -286,7 +286,7 @@ static int pix_decode_frame(AVCodecContext *avctx, AVFrame *frame, const FFCodec ff_brender_pix_decoder = { .p.name = "brender_pix", - .p.long_name = NULL_IF_CONFIG_SMALL("BRender PIX image"), + CODEC_LONG_NAME("BRender PIX image"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_BRENDER_PIX, .p.capabilities = AV_CODEC_CAP_DR1, diff --git a/libavcodec/c93.c b/libavcodec/c93.c index 03381f1e88..66b551a5d6 100644 --- a/libavcodec/c93.c +++ b/libavcodec/c93.c @@ -260,7 +260,7 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *rframe, const FFCodec ff_c93_decoder = { .p.name = "c93", - .p.long_name = NULL_IF_CONFIG_SMALL("Interplay C93"), + CODEC_LONG_NAME("Interplay C93"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_C93, .priv_data_size = sizeof(C93DecoderContext), diff --git a/libavcodec/cavsdec.c b/libavcodec/cavsdec.c index 3d4e306c93..3e8be65968 100644 --- a/libavcodec/cavsdec.c +++ b/libavcodec/cavsdec.c @@ -1317,7 +1317,7 @@ static int cavs_decode_frame(AVCodecContext *avctx, AVFrame *rframe, const FFCodec ff_cavs_decoder = { .p.name = "cavs", - .p.long_name = NULL_IF_CONFIG_SMALL("Chinese AVS (Audio Video Standard) (AVS1-P2, JiZhun profile)"), + CODEC_LONG_NAME("Chinese AVS (Audio Video Standard) (AVS1-P2, JiZhun profile)"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_CAVS, .priv_data_size = sizeof(AVSContext), diff --git a/libavcodec/ccaption_dec.c b/libavcodec/ccaption_dec.c index 13648ff306..61eda9ff56 100644 --- a/libavcodec/ccaption_dec.c +++ b/libavcodec/ccaption_dec.c @@ -946,7 +946,7 @@ static const AVClass ccaption_dec_class = { const FFCodec ff_ccaption_decoder = { .p.name = "cc_dec", - .p.long_name = NULL_IF_CONFIG_SMALL("Closed Caption (EIA-608 / CEA-708)"), + CODEC_LONG_NAME("Closed Caption (EIA-608 / CEA-708)"), .p.type = AVMEDIA_TYPE_SUBTITLE, .p.id = AV_CODEC_ID_EIA_608, .p.priv_class = &ccaption_dec_class, diff --git a/libavcodec/cdgraphics.c b/libavcodec/cdgraphics.c index 19366bdcfe..51363b6be2 100644 --- a/libavcodec/cdgraphics.c +++ b/libavcodec/cdgraphics.c @@ -389,7 +389,7 @@ static av_cold int cdg_decode_end(AVCodecContext *avctx) const FFCodec ff_cdgraphics_decoder = { .p.name = "cdgraphics", - .p.long_name = NULL_IF_CONFIG_SMALL("CD Graphics video"), + CODEC_LONG_NAME("CD Graphics video"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_CDGRAPHICS, .priv_data_size = sizeof(CDGraphicsContext), diff --git a/libavcodec/cdtoons.c b/libavcodec/cdtoons.c index 00fbe58c26..3ebed2267c 100644 --- a/libavcodec/cdtoons.c +++ b/libavcodec/cdtoons.c @@ -445,7 +445,7 @@ static av_cold int cdtoons_decode_end(AVCodecContext *avctx) const FFCodec ff_cdtoons_decoder = { .p.name = "cdtoons", - .p.long_name = NULL_IF_CONFIG_SMALL("CDToons video"), + CODEC_LONG_NAME("CDToons video"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_CDTOONS, .priv_data_size = sizeof(CDToonsContext), diff --git a/libavcodec/cdxl.c b/libavcodec/cdxl.c index 5821aaeb22..6b3b3e85e0 100644 --- a/libavcodec/cdxl.c +++ b/libavcodec/cdxl.c @@ -337,7 +337,7 @@ static av_cold int cdxl_decode_end(AVCodecContext *avctx) const FFCodec ff_cdxl_decoder = { .p.name = "cdxl", - .p.long_name = NULL_IF_CONFIG_SMALL("Commodore CDXL video"), + CODEC_LONG_NAME("Commodore CDXL video"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_CDXL, .priv_data_size = sizeof(CDXLVideoContext), diff --git a/libavcodec/cfhd.c b/libavcodec/cfhd.c index e72512707e..59f8c795a2 100644 --- a/libavcodec/cfhd.c +++ b/libavcodec/cfhd.c @@ -1457,7 +1457,7 @@ static int update_thread_context(AVCodecContext *dst, const AVCodecContext *src) const FFCodec ff_cfhd_decoder = { .p.name = "cfhd", - .p.long_name = NULL_IF_CONFIG_SMALL("GoPro CineForm HD"), + CODEC_LONG_NAME("GoPro CineForm HD"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_CFHD, .priv_data_size = sizeof(CFHDContext), diff --git a/libavcodec/cfhdenc.c b/libavcodec/cfhdenc.c index 75858624b4..0fca46ef3a 100644 --- a/libavcodec/cfhdenc.c +++ b/libavcodec/cfhdenc.c @@ -848,7 +848,7 @@ static const AVClass cfhd_class = { const FFCodec ff_cfhd_encoder = { .p.name = "cfhd", - .p.long_name = NULL_IF_CONFIG_SMALL("GoPro CineForm HD"), + CODEC_LONG_NAME("GoPro CineForm HD"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_CFHD, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS, diff --git a/libavcodec/cinepak.c b/libavcodec/cinepak.c index 480afbc81d..282614fd1d 100644 --- a/libavcodec/cinepak.c +++ b/libavcodec/cinepak.c @@ -506,7 +506,7 @@ static av_cold int cinepak_decode_end(AVCodecContext *avctx) const FFCodec ff_cinepak_decoder = { .p.name = "cinepak", - .p.long_name = NULL_IF_CONFIG_SMALL("Cinepak"), + CODEC_LONG_NAME("Cinepak"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_CINEPAK, .priv_data_size = sizeof(CinepakContext), diff --git a/libavcodec/cinepakenc.c b/libavcodec/cinepakenc.c index bff6833ceb..c05449e89c 100644 --- a/libavcodec/cinepakenc.c +++ b/libavcodec/cinepakenc.c @@ -1216,7 +1216,7 @@ static av_cold int cinepak_encode_end(AVCodecContext *avctx) const FFCodec ff_cinepak_encoder = { .p.name = "cinepak", - .p.long_name = NULL_IF_CONFIG_SMALL("Cinepak"), + CODEC_LONG_NAME("Cinepak"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_CINEPAK, .p.capabilities = AV_CODEC_CAP_DR1, diff --git a/libavcodec/clearvideo.c b/libavcodec/clearvideo.c index 8615bf2a51..4d6549560b 100644 --- a/libavcodec/clearvideo.c +++ b/libavcodec/clearvideo.c @@ -769,7 +769,7 @@ static av_cold int clv_decode_end(AVCodecContext *avctx) const FFCodec ff_clearvideo_decoder = { .p.name = "clearvideo", - .p.long_name = NULL_IF_CONFIG_SMALL("Iterated Systems ClearVideo"), + CODEC_LONG_NAME("Iterated Systems ClearVideo"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_CLEARVIDEO, .priv_data_size = sizeof(CLVContext), diff --git a/libavcodec/cljrdec.c b/libavcodec/cljrdec.c index 0550e1dc05..914f853c8f 100644 --- a/libavcodec/cljrdec.c +++ b/libavcodec/cljrdec.c @@ -83,7 +83,7 @@ static av_cold int decode_init(AVCodecContext *avctx) const FFCodec ff_cljr_decoder = { .p.name = "cljr", - .p.long_name = NULL_IF_CONFIG_SMALL("Cirrus Logic AccuPak"), + CODEC_LONG_NAME("Cirrus Logic AccuPak"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_CLJR, .init = decode_init, diff --git a/libavcodec/cljrenc.c b/libavcodec/cljrenc.c index f84191b427..c1f8810a5a 100644 --- a/libavcodec/cljrenc.c +++ b/libavcodec/cljrenc.c @@ -110,7 +110,7 @@ static const AVClass cljr_class = { const FFCodec ff_cljr_encoder = { .p.name = "cljr", - .p.long_name = NULL_IF_CONFIG_SMALL("Cirrus Logic AccuPak"), + CODEC_LONG_NAME("Cirrus Logic AccuPak"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_CLJR, .p.capabilities = AV_CODEC_CAP_DR1, diff --git a/libavcodec/cllc.c b/libavcodec/cllc.c index 1b9fdb80f0..911717b68d 100644 --- a/libavcodec/cllc.c +++ b/libavcodec/cllc.c @@ -493,7 +493,7 @@ static av_cold int cllc_decode_init(AVCodecContext *avctx) const FFCodec ff_cllc_decoder = { .p.name = "cllc", - .p.long_name = NULL_IF_CONFIG_SMALL("Canopus Lossless Codec"), + CODEC_LONG_NAME("Canopus Lossless Codec"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_CLLC, .priv_data_size = sizeof(CLLCContext), diff --git a/libavcodec/cngdec.c b/libavcodec/cngdec.c index e698d142dd..5cf5dc9bcf 100644 --- a/libavcodec/cngdec.c +++ b/libavcodec/cngdec.c @@ -165,7 +165,7 @@ static int cng_decode_frame(AVCodecContext *avctx, AVFrame *frame, const FFCodec ff_comfortnoise_decoder = { .p.name = "comfortnoise", - .p.long_name = NULL_IF_CONFIG_SMALL("RFC 3389 comfort noise generator"), + CODEC_LONG_NAME("RFC 3389 comfort noise generator"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_COMFORT_NOISE, .priv_data_size = sizeof(CNGContext), diff --git a/libavcodec/cngenc.c b/libavcodec/cngenc.c index 7bb4bee857..ff40017f0d 100644 --- a/libavcodec/cngenc.c +++ b/libavcodec/cngenc.c @@ -98,7 +98,7 @@ static int cng_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, const FFCodec ff_comfortnoise_encoder = { .p.name = "comfortnoise", - .p.long_name = NULL_IF_CONFIG_SMALL("RFC 3389 comfort noise generator"), + CODEC_LONG_NAME("RFC 3389 comfort noise generator"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_COMFORT_NOISE, .p.capabilities = AV_CODEC_CAP_DR1, diff --git a/libavcodec/codec_internal.h b/libavcodec/codec_internal.h index 62ea91cf4d..310e243d84 100644 --- a/libavcodec/codec_internal.h +++ b/libavcodec/codec_internal.h @@ -23,6 +23,7 @@ #include "libavutil/attributes.h" #include "codec.h" +#include "config.h" /** * The codec is not known to be init-threadsafe (i.e. it might be unsafe @@ -257,6 +258,12 @@ typedef struct FFCodec { const uint32_t *codec_tags; } FFCodec; +#if CONFIG_SMALL +#define CODEC_LONG_NAME(str) .p.long_name = NULL +#else +#define CODEC_LONG_NAME(str) .p.long_name = str +#endif + #define FF_CODEC_DECODE_CB(func) \ .cb_type = FF_CODEC_CB_TYPE_DECODE, \ .cb.decode = (func) diff --git a/libavcodec/cook.c b/libavcodec/cook.c index 5ccabb03ed..7c666f5cfe 100644 --- a/libavcodec/cook.c +++ b/libavcodec/cook.c @@ -1298,7 +1298,7 @@ static av_cold int cook_decode_init(AVCodecContext *avctx) const FFCodec ff_cook_decoder = { .p.name = "cook", - .p.long_name = NULL_IF_CONFIG_SMALL("Cook / Cooker / Gecko (RealAudio G2)"), + CODEC_LONG_NAME("Cook / Cooker / Gecko (RealAudio G2)"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_COOK, .priv_data_size = sizeof(COOKContext), diff --git a/libavcodec/cpia.c b/libavcodec/cpia.c index c798038161..99362e73f0 100644 --- a/libavcodec/cpia.c +++ b/libavcodec/cpia.c @@ -224,7 +224,7 @@ static av_cold int cpia_decode_end(AVCodecContext *avctx) const FFCodec ff_cpia_decoder = { .p.name = "cpia", - .p.long_name = NULL_IF_CONFIG_SMALL("CPiA video format"), + CODEC_LONG_NAME("CPiA video format"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_CPIA, .priv_data_size = sizeof(CpiaContext), diff --git a/libavcodec/cri.c b/libavcodec/cri.c index 65eb53d22e..ec5c88f897 100644 --- a/libavcodec/cri.c +++ b/libavcodec/cri.c @@ -433,5 +433,5 @@ const FFCodec ff_cri_decoder = { .close = cri_decode_close, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS, .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, - .p.long_name = NULL_IF_CONFIG_SMALL("Cintel RAW"), + CODEC_LONG_NAME("Cintel RAW"), }; diff --git a/libavcodec/crystalhd.c b/libavcodec/crystalhd.c index bdc2ecc116..8673a491d4 100644 --- a/libavcodec/crystalhd.c +++ b/libavcodec/crystalhd.c @@ -776,7 +776,7 @@ static int crystalhd_receive_frame(AVCodecContext *avctx, AVFrame *frame) }; \ const FFCodec ff_##x##_crystalhd_decoder = { \ .p.name = #x "_crystalhd", \ - .p.long_name = NULL_IF_CONFIG_SMALL("CrystalHD " #X " decoder"), \ + CODEC_LONG_NAME("CrystalHD " #X " decoder"), \ .p.type = AVMEDIA_TYPE_VIDEO, \ .p.id = AV_CODEC_ID_##X, \ .priv_data_size = sizeof(CHDContext), \ diff --git a/libavcodec/cscd.c b/libavcodec/cscd.c index 51756b6d12..b4ed3332a9 100644 --- a/libavcodec/cscd.c +++ b/libavcodec/cscd.c @@ -167,7 +167,7 @@ static av_cold int decode_end(AVCodecContext *avctx) const FFCodec ff_cscd_decoder = { .p.name = "camstudio", - .p.long_name = NULL_IF_CONFIG_SMALL("CamStudio"), + CODEC_LONG_NAME("CamStudio"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_CSCD, .priv_data_size = sizeof(CamStudioContext), diff --git a/libavcodec/cuviddec.c b/libavcodec/cuviddec.c index 82c40fc64e..4ba7918b64 100644 --- a/libavcodec/cuviddec.c +++ b/libavcodec/cuviddec.c @@ -1118,7 +1118,7 @@ static const AVCodecHWConfigInternal *const cuvid_hw_configs[] = { }; \ const FFCodec ff_##x##_cuvid_decoder = { \ .p.name = #x "_cuvid", \ - .p.long_name = NULL_IF_CONFIG_SMALL("Nvidia CUVID " #X " decoder"), \ + CODEC_LONG_NAME("Nvidia CUVID " #X " decoder"), \ .p.type = AVMEDIA_TYPE_VIDEO, \ .p.id = AV_CODEC_ID_##X, \ .priv_data_size = sizeof(CuvidContext), \ diff --git a/libavcodec/cyuv.c b/libavcodec/cyuv.c index 8a7cef6b74..f233b362dc 100644 --- a/libavcodec/cyuv.c +++ b/libavcodec/cyuv.c @@ -177,7 +177,7 @@ static int cyuv_decode_frame(AVCodecContext *avctx, AVFrame *frame, #if CONFIG_AURA_DECODER const FFCodec ff_aura_decoder = { .p.name = "aura", - .p.long_name = NULL_IF_CONFIG_SMALL("Auravision AURA"), + CODEC_LONG_NAME("Auravision AURA"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_AURA, .priv_data_size = sizeof(CyuvDecodeContext), @@ -190,7 +190,7 @@ const FFCodec ff_aura_decoder = { #if CONFIG_CYUV_DECODER const FFCodec ff_cyuv_decoder = { .p.name = "cyuv", - .p.long_name = NULL_IF_CONFIG_SMALL("Creative YUV (CYUV)"), + CODEC_LONG_NAME("Creative YUV (CYUV)"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_CYUV, .priv_data_size = sizeof(CyuvDecodeContext), diff --git a/libavcodec/dcadec.c b/libavcodec/dcadec.c index 46d3650b25..3e3e3053bb 100644 --- a/libavcodec/dcadec.c +++ b/libavcodec/dcadec.c @@ -412,7 +412,7 @@ static const AVClass dcadec_class = { const FFCodec ff_dca_decoder = { .p.name = "dca", - .p.long_name = NULL_IF_CONFIG_SMALL("DCA (DTS Coherent Acoustics)"), + CODEC_LONG_NAME("DCA (DTS Coherent Acoustics)"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_DTS, .priv_data_size = sizeof(DCAContext), diff --git a/libavcodec/dcaenc.c b/libavcodec/dcaenc.c index 6901e67860..d02602761b 100644 --- a/libavcodec/dcaenc.c +++ b/libavcodec/dcaenc.c @@ -1238,7 +1238,7 @@ static const FFCodecDefault defaults[] = { const FFCodec ff_dca_encoder = { .p.name = "dca", - .p.long_name = NULL_IF_CONFIG_SMALL("DCA (DTS Coherent Acoustics)"), + CODEC_LONG_NAME("DCA (DTS Coherent Acoustics)"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_DTS, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_EXPERIMENTAL, diff --git a/libavcodec/dds.c b/libavcodec/dds.c index 6904191310..4bb425dbb3 100644 --- a/libavcodec/dds.c +++ b/libavcodec/dds.c @@ -710,7 +710,7 @@ static int dds_decode(AVCodecContext *avctx, AVFrame *frame, const FFCodec ff_dds_decoder = { .p.name = "dds", - .p.long_name = NULL_IF_CONFIG_SMALL("DirectDraw Surface image decoder"), + CODEC_LONG_NAME("DirectDraw Surface image decoder"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_DDS, FF_CODEC_DECODE_CB(dds_decode), diff --git a/libavcodec/dfa.c b/libavcodec/dfa.c index dadb64d87e..114c803f32 100644 --- a/libavcodec/dfa.c +++ b/libavcodec/dfa.c @@ -423,7 +423,7 @@ static av_cold int dfa_decode_end(AVCodecContext *avctx) const FFCodec ff_dfa_decoder = { .p.name = "dfa", - .p.long_name = NULL_IF_CONFIG_SMALL("Chronomaster DFA"), + CODEC_LONG_NAME("Chronomaster DFA"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_DFA, .priv_data_size = sizeof(DfaContext), diff --git a/libavcodec/dfpwmdec.c b/libavcodec/dfpwmdec.c index 975afba4cc..532a955b4c 100644 --- a/libavcodec/dfpwmdec.c +++ b/libavcodec/dfpwmdec.c @@ -127,7 +127,7 @@ static int dfpwm_dec_frame(struct AVCodecContext *ctx, AVFrame *frame, const FFCodec ff_dfpwm_decoder = { .p.name = "dfpwm", - .p.long_name = NULL_IF_CONFIG_SMALL("DFPWM1a audio"), + CODEC_LONG_NAME("DFPWM1a audio"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_DFPWM, .priv_data_size = sizeof(DFPWMState), diff --git a/libavcodec/dfpwmenc.c b/libavcodec/dfpwmenc.c index 41ad645315..7f465a446e 100644 --- a/libavcodec/dfpwmenc.c +++ b/libavcodec/dfpwmenc.c @@ -109,7 +109,7 @@ static int dfpwm_enc_frame(struct AVCodecContext *ctx, struct AVPacket *packet, const FFCodec ff_dfpwm_encoder = { .p.name = "dfpwm", - .p.long_name = NULL_IF_CONFIG_SMALL("DFPWM1a audio"), + CODEC_LONG_NAME("DFPWM1a audio"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_DFPWM, .priv_data_size = sizeof(DFPWMState), diff --git a/libavcodec/diracdec.c b/libavcodec/diracdec.c index ef00c29150..a5cad29597 100644 --- a/libavcodec/diracdec.c +++ b/libavcodec/diracdec.c @@ -2357,7 +2357,7 @@ static int dirac_decode_frame(AVCodecContext *avctx, AVFrame *picture, const FFCodec ff_dirac_decoder = { .p.name = "dirac", - .p.long_name = NULL_IF_CONFIG_SMALL("BBC Dirac VC-2"), + CODEC_LONG_NAME("BBC Dirac VC-2"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_DIRAC, .priv_data_size = sizeof(DiracContext), diff --git a/libavcodec/dnxhddec.c b/libavcodec/dnxhddec.c index 1c749d026c..17b7179927 100644 --- a/libavcodec/dnxhddec.c +++ b/libavcodec/dnxhddec.c @@ -726,7 +726,7 @@ static av_cold int dnxhd_decode_close(AVCodecContext *avctx) const FFCodec ff_dnxhd_decoder = { .p.name = "dnxhd", - .p.long_name = NULL_IF_CONFIG_SMALL("VC3/DNxHD"), + CODEC_LONG_NAME("VC3/DNxHD"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_DNXHD, .priv_data_size = sizeof(DNXHDContext), diff --git a/libavcodec/dnxhdenc.c b/libavcodec/dnxhdenc.c index 5029e510ef..e1008ec776 100644 --- a/libavcodec/dnxhdenc.c +++ b/libavcodec/dnxhdenc.c @@ -1355,7 +1355,7 @@ static const FFCodecDefault dnxhd_defaults[] = { const FFCodec ff_dnxhd_encoder = { .p.name = "dnxhd", - .p.long_name = NULL_IF_CONFIG_SMALL("VC3/DNxHD"), + CODEC_LONG_NAME("VC3/DNxHD"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_DNXHD, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS | diff --git a/libavcodec/dolby_e.c b/libavcodec/dolby_e.c index de852ecc0a..06f4fdd44f 100644 --- a/libavcodec/dolby_e.c +++ b/libavcodec/dolby_e.c @@ -1299,7 +1299,7 @@ static const AVClass dolby_e_decoder_class = { const FFCodec ff_dolby_e_decoder = { .p.name = "dolby_e", - .p.long_name = NULL_IF_CONFIG_SMALL("Dolby E"), + CODEC_LONG_NAME("Dolby E"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_DOLBY_E, .priv_data_size = sizeof(DBEDecodeContext), diff --git a/libavcodec/dpcm.c b/libavcodec/dpcm.c index 34f3799b80..2425f84eb9 100644 --- a/libavcodec/dpcm.c +++ b/libavcodec/dpcm.c @@ -411,7 +411,7 @@ static int dpcm_decode_frame(AVCodecContext *avctx, AVFrame *frame, #define DPCM_DECODER(id_, name_, long_name_) \ const FFCodec ff_ ## name_ ## _decoder = { \ .p.name = #name_, \ - .p.long_name = NULL_IF_CONFIG_SMALL(long_name_), \ + CODEC_LONG_NAME(long_name_), \ .p.type = AVMEDIA_TYPE_AUDIO, \ .p.id = id_, \ .p.capabilities = AV_CODEC_CAP_DR1, \ diff --git a/libavcodec/dpx.c b/libavcodec/dpx.c index afd9f17b04..4f50608461 100644 --- a/libavcodec/dpx.c +++ b/libavcodec/dpx.c @@ -761,7 +761,7 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *p, const FFCodec ff_dpx_decoder = { .p.name = "dpx", - .p.long_name = NULL_IF_CONFIG_SMALL("DPX (Digital Picture Exchange) image"), + CODEC_LONG_NAME("DPX (Digital Picture Exchange) image"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_DPX, FF_CODEC_DECODE_CB(decode_frame), diff --git a/libavcodec/dpxenc.c b/libavcodec/dpxenc.c index c261d05fe2..e136cc1b9e 100644 --- a/libavcodec/dpxenc.c +++ b/libavcodec/dpxenc.c @@ -276,7 +276,7 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, const FFCodec ff_dpx_encoder = { .p.name = "dpx", - .p.long_name = NULL_IF_CONFIG_SMALL("DPX (Digital Picture Exchange) image"), + CODEC_LONG_NAME("DPX (Digital Picture Exchange) image"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_DPX, .p.capabilities = AV_CODEC_CAP_DR1, diff --git a/libavcodec/dsddec.c b/libavcodec/dsddec.c index 0fdc2af565..3962075773 100644 --- a/libavcodec/dsddec.c +++ b/libavcodec/dsddec.c @@ -118,7 +118,7 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *frame, #define DSD_DECODER(id_, name_, long_name_) \ const FFCodec ff_ ## name_ ## _decoder = { \ .p.name = #name_, \ - .p.long_name = NULL_IF_CONFIG_SMALL(long_name_), \ + CODEC_LONG_NAME(long_name_), \ .p.type = AVMEDIA_TYPE_AUDIO, \ .p.id = AV_CODEC_ID_##id_, \ .init = decode_init, \ diff --git a/libavcodec/dsicinaudio.c b/libavcodec/dsicinaudio.c index ea37e68ea2..aa14966c7b 100644 --- a/libavcodec/dsicinaudio.c +++ b/libavcodec/dsicinaudio.c @@ -123,7 +123,7 @@ static int cinaudio_decode_frame(AVCodecContext *avctx, AVFrame *frame, const FFCodec ff_dsicinaudio_decoder = { .p.name = "dsicinaudio", - .p.long_name = NULL_IF_CONFIG_SMALL("Delphine Software International CIN audio"), + CODEC_LONG_NAME("Delphine Software International CIN audio"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_DSICINAUDIO, .priv_data_size = sizeof(CinAudioContext), diff --git a/libavcodec/dsicinvideo.c b/libavcodec/dsicinvideo.c index 32efefade1..222044d125 100644 --- a/libavcodec/dsicinvideo.c +++ b/libavcodec/dsicinvideo.c @@ -323,7 +323,7 @@ static av_cold int cinvideo_decode_end(AVCodecContext *avctx) const FFCodec ff_dsicinvideo_decoder = { .p.name = "dsicinvideo", - .p.long_name = NULL_IF_CONFIG_SMALL("Delphine Software International CIN video"), + CODEC_LONG_NAME("Delphine Software International CIN video"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_DSICINVIDEO, .priv_data_size = sizeof(CinVideoContext), diff --git a/libavcodec/dss_sp.c b/libavcodec/dss_sp.c index 74419514d4..9337371bce 100644 --- a/libavcodec/dss_sp.c +++ b/libavcodec/dss_sp.c @@ -773,7 +773,7 @@ static int dss_sp_decode_frame(AVCodecContext *avctx, AVFrame *frame, const FFCodec ff_dss_sp_decoder = { .p.name = "dss_sp", - .p.long_name = NULL_IF_CONFIG_SMALL("Digital Speech Standard - Standard Play mode (DSS SP)"), + CODEC_LONG_NAME("Digital Speech Standard - Standard Play mode (DSS SP)"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_DSS_SP, .priv_data_size = sizeof(DssSpContext), diff --git a/libavcodec/dstdec.c b/libavcodec/dstdec.c index 59f8e900d8..6bdd6c885c 100644 --- a/libavcodec/dstdec.c +++ b/libavcodec/dstdec.c @@ -380,7 +380,7 @@ dsd: const FFCodec ff_dst_decoder = { .p.name = "dst", - .p.long_name = NULL_IF_CONFIG_SMALL("DST (Digital Stream Transfer)"), + CODEC_LONG_NAME("DST (Digital Stream Transfer)"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_DST, .priv_data_size = sizeof(DSTContext), diff --git a/libavcodec/dvaudiodec.c b/libavcodec/dvaudiodec.c index 96bcadeb57..1c8344095a 100644 --- a/libavcodec/dvaudiodec.c +++ b/libavcodec/dvaudiodec.c @@ -120,7 +120,7 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *frame, const FFCodec ff_dvaudio_decoder = { .p.name = "dvaudio", - .p.long_name = NULL_IF_CONFIG_SMALL("Ulead DV Audio"), + CODEC_LONG_NAME("Ulead DV Audio"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_DVAUDIO, .init = decode_init, diff --git a/libavcodec/dvbsubdec.c b/libavcodec/dvbsubdec.c index 63d4a13bcb..bcc607d1d7 100644 --- a/libavcodec/dvbsubdec.c +++ b/libavcodec/dvbsubdec.c @@ -1571,7 +1571,7 @@ static const AVClass dvbsubdec_class = { const FFCodec ff_dvbsub_decoder = { .p.name = "dvbsub", - .p.long_name = NULL_IF_CONFIG_SMALL("DVB subtitles"), + CODEC_LONG_NAME("DVB subtitles"), .p.type = AVMEDIA_TYPE_SUBTITLE, .p.id = AV_CODEC_ID_DVB_SUBTITLE, .priv_data_size = sizeof(DVBSubContext), diff --git a/libavcodec/dvbsubenc.c b/libavcodec/dvbsubenc.c index 06087b058d..822e3a5309 100644 --- a/libavcodec/dvbsubenc.c +++ b/libavcodec/dvbsubenc.c @@ -508,7 +508,7 @@ static int dvbsub_encode(AVCodecContext *avctx, uint8_t *outbuf, int buf_size, const FFCodec ff_dvbsub_encoder = { .p.name = "dvbsub", - .p.long_name = NULL_IF_CONFIG_SMALL("DVB subtitles"), + CODEC_LONG_NAME("DVB subtitles"), .p.type = AVMEDIA_TYPE_SUBTITLE, .p.id = AV_CODEC_ID_DVB_SUBTITLE, .priv_data_size = sizeof(DVBSubtitleContext), diff --git a/libavcodec/dvdec.c b/libavcodec/dvdec.c index 12e837c9ff..3af3e82eab 100644 --- a/libavcodec/dvdec.c +++ b/libavcodec/dvdec.c @@ -681,7 +681,7 @@ static int dvvideo_decode_frame(AVCodecContext *avctx, AVFrame *frame, const FFCodec ff_dvvideo_decoder = { .p.name = "dvvideo", - .p.long_name = NULL_IF_CONFIG_SMALL("DV (Digital Video)"), + CODEC_LONG_NAME("DV (Digital Video)"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_DVVIDEO, .priv_data_size = sizeof(DVVideoContext), diff --git a/libavcodec/dvdsubdec.c b/libavcodec/dvdsubdec.c index e1ae441880..a5da0d7b08 100644 --- a/libavcodec/dvdsubdec.c +++ b/libavcodec/dvdsubdec.c @@ -708,7 +708,7 @@ static const AVClass dvdsub_class = { const FFCodec ff_dvdsub_decoder = { .p.name = "dvdsub", - .p.long_name = NULL_IF_CONFIG_SMALL("DVD subtitles"), + CODEC_LONG_NAME("DVD subtitles"), .p.type = AVMEDIA_TYPE_SUBTITLE, .p.id = AV_CODEC_ID_DVD_SUBTITLE, .priv_data_size = sizeof(DVDSubContext), diff --git a/libavcodec/dvdsubenc.c b/libavcodec/dvdsubenc.c index 37d6efdd5d..0874aaa02d 100644 --- a/libavcodec/dvdsubenc.c +++ b/libavcodec/dvdsubenc.c @@ -502,7 +502,7 @@ static const AVClass dvdsubenc_class = { const FFCodec ff_dvdsub_encoder = { .p.name = "dvdsub", - .p.long_name = NULL_IF_CONFIG_SMALL("DVD subtitles"), + CODEC_LONG_NAME("DVD subtitles"), .p.type = AVMEDIA_TYPE_SUBTITLE, .p.id = AV_CODEC_ID_DVD_SUBTITLE, .init = dvdsub_init, diff --git a/libavcodec/dvenc.c b/libavcodec/dvenc.c index 5ba4de3213..78328f544c 100644 --- a/libavcodec/dvenc.c +++ b/libavcodec/dvenc.c @@ -1207,7 +1207,7 @@ static const AVClass dvvideo_encode_class = { const FFCodec ff_dvvideo_encoder = { .p.name = "dvvideo", - .p.long_name = NULL_IF_CONFIG_SMALL("DV (Digital Video)"), + CODEC_LONG_NAME("DV (Digital Video)"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_DVVIDEO, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS | diff --git a/libavcodec/dxa.c b/libavcodec/dxa.c index a557501104..8d2d2d771b 100644 --- a/libavcodec/dxa.c +++ b/libavcodec/dxa.c @@ -360,7 +360,7 @@ static av_cold int decode_end(AVCodecContext *avctx) const FFCodec ff_dxa_decoder = { .p.name = "dxa", - .p.long_name = NULL_IF_CONFIG_SMALL("Feeble Files/ScummVM DXA"), + CODEC_LONG_NAME("Feeble Files/ScummVM DXA"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_DXA, .priv_data_size = sizeof(DxaDecContext), diff --git a/libavcodec/dxtory.c b/libavcodec/dxtory.c index b7dfff4755..e13d274862 100644 --- a/libavcodec/dxtory.c +++ b/libavcodec/dxtory.c @@ -872,7 +872,7 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *pic, const FFCodec ff_dxtory_decoder = { .p.name = "dxtory", - .p.long_name = NULL_IF_CONFIG_SMALL("Dxtory"), + CODEC_LONG_NAME("Dxtory"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_DXTORY, FF_CODEC_DECODE_CB(decode_frame), diff --git a/libavcodec/dxv.c b/libavcodec/dxv.c index 13c028d8ba..7c84874229 100644 --- a/libavcodec/dxv.c +++ b/libavcodec/dxv.c @@ -1262,7 +1262,7 @@ static int dxv_close(AVCodecContext *avctx) const FFCodec ff_dxv_decoder = { .p.name = "dxv", - .p.long_name = NULL_IF_CONFIG_SMALL("Resolume DXV"), + CODEC_LONG_NAME("Resolume DXV"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_DXV, .init = dxv_init, diff --git a/libavcodec/eac3enc.c b/libavcodec/eac3enc.c index 9f8704450a..648c93dcaa 100644 --- a/libavcodec/eac3enc.c +++ b/libavcodec/eac3enc.c @@ -252,7 +252,7 @@ void ff_eac3_output_frame_header(AC3EncodeContext *s) FF_DISABLE_DEPRECATION_WARNINGS const FFCodec ff_eac3_encoder = { .p.name = "eac3", - .p.long_name = NULL_IF_CONFIG_SMALL("ATSC A/52 E-AC-3"), + CODEC_LONG_NAME("ATSC A/52 E-AC-3"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_EAC3, .p.capabilities = AV_CODEC_CAP_DR1, diff --git a/libavcodec/eacmv.c b/libavcodec/eacmv.c index e8d757ed37..18f27dfdf0 100644 --- a/libavcodec/eacmv.c +++ b/libavcodec/eacmv.c @@ -231,7 +231,7 @@ static av_cold int cmv_decode_end(AVCodecContext *avctx){ const FFCodec ff_eacmv_decoder = { .p.name = "eacmv", - .p.long_name = NULL_IF_CONFIG_SMALL("Electronic Arts CMV video"), + CODEC_LONG_NAME("Electronic Arts CMV video"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_CMV, .priv_data_size = sizeof(CmvContext), diff --git a/libavcodec/eamad.c b/libavcodec/eamad.c index 4904730c65..7ce2ce36c8 100644 --- a/libavcodec/eamad.c +++ b/libavcodec/eamad.c @@ -342,7 +342,7 @@ static av_cold int decode_end(AVCodecContext *avctx) const FFCodec ff_eamad_decoder = { .p.name = "eamad", - .p.long_name = NULL_IF_CONFIG_SMALL("Electronic Arts Madcow Video"), + CODEC_LONG_NAME("Electronic Arts Madcow Video"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_MAD, .priv_data_size = sizeof(MadContext), diff --git a/libavcodec/eatgq.c b/libavcodec/eatgq.c index bdf70292fd..a6c3e72f85 100644 --- a/libavcodec/eatgq.c +++ b/libavcodec/eatgq.c @@ -248,7 +248,7 @@ static int tgq_decode_frame(AVCodecContext *avctx, AVFrame *frame, const FFCodec ff_eatgq_decoder = { .p.name = "eatgq", - .p.long_name = NULL_IF_CONFIG_SMALL("Electronic Arts TGQ video"), + CODEC_LONG_NAME("Electronic Arts TGQ video"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_TGQ, .priv_data_size = sizeof(TgqContext), diff --git a/libavcodec/eatgv.c b/libavcodec/eatgv.c index 02a547b2da..29f7ee12f5 100644 --- a/libavcodec/eatgv.c +++ b/libavcodec/eatgv.c @@ -359,7 +359,7 @@ static av_cold int tgv_decode_end(AVCodecContext *avctx) const FFCodec ff_eatgv_decoder = { .p.name = "eatgv", - .p.long_name = NULL_IF_CONFIG_SMALL("Electronic Arts TGV video"), + CODEC_LONG_NAME("Electronic Arts TGV video"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_TGV, .priv_data_size = sizeof(TgvContext), diff --git a/libavcodec/eatqi.c b/libavcodec/eatqi.c index 1aafd9af0c..4799f75886 100644 --- a/libavcodec/eatqi.c +++ b/libavcodec/eatqi.c @@ -183,7 +183,7 @@ static av_cold int tqi_decode_end(AVCodecContext *avctx) const FFCodec ff_eatqi_decoder = { .p.name = "eatqi", - .p.long_name = NULL_IF_CONFIG_SMALL("Electronic Arts TQI Video"), + CODEC_LONG_NAME("Electronic Arts TQI Video"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_TQI, .priv_data_size = sizeof(TqiContext), diff --git a/libavcodec/escape124.c b/libavcodec/escape124.c index 6906992305..eeeb9bb0f7 100644 --- a/libavcodec/escape124.c +++ b/libavcodec/escape124.c @@ -377,7 +377,7 @@ static int escape124_decode_frame(AVCodecContext *avctx, AVFrame *frame, const FFCodec ff_escape124_decoder = { .p.name = "escape124", - .p.long_name = NULL_IF_CONFIG_SMALL("Escape 124"), + CODEC_LONG_NAME("Escape 124"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_ESCAPE124, .priv_data_size = sizeof(Escape124Context), diff --git a/libavcodec/escape130.c b/libavcodec/escape130.c index 5bf1a5d745..3b0460fd79 100644 --- a/libavcodec/escape130.c +++ b/libavcodec/escape130.c @@ -347,7 +347,7 @@ static int escape130_decode_frame(AVCodecContext *avctx, AVFrame *pic, const FFCodec ff_escape130_decoder = { .p.name = "escape130", - .p.long_name = NULL_IF_CONFIG_SMALL("Escape 130"), + CODEC_LONG_NAME("Escape 130"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_ESCAPE130, .priv_data_size = sizeof(Escape130Context), diff --git a/libavcodec/evrcdec.c b/libavcodec/evrcdec.c index 2ac98b8e76..c4b0ad2957 100644 --- a/libavcodec/evrcdec.c +++ b/libavcodec/evrcdec.c @@ -931,7 +931,7 @@ static const AVClass evrcdec_class = { const FFCodec ff_evrc_decoder = { .p.name = "evrc", - .p.long_name = NULL_IF_CONFIG_SMALL("EVRC (Enhanced Variable Rate Codec)"), + CODEC_LONG_NAME("EVRC (Enhanced Variable Rate Codec)"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_EVRC, .init = evrc_decode_init, diff --git a/libavcodec/exr.c b/libavcodec/exr.c index f6eab048f4..235f6fa6cd 100644 --- a/libavcodec/exr.c +++ b/libavcodec/exr.c @@ -2335,7 +2335,7 @@ static const AVClass exr_class = { const FFCodec ff_exr_decoder = { .p.name = "exr", - .p.long_name = NULL_IF_CONFIG_SMALL("OpenEXR image"), + CODEC_LONG_NAME("OpenEXR image"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_EXR, .priv_data_size = sizeof(EXRContext), diff --git a/libavcodec/exrenc.c b/libavcodec/exrenc.c index 3dad107d62..10ed876888 100644 --- a/libavcodec/exrenc.c +++ b/libavcodec/exrenc.c @@ -542,7 +542,7 @@ static const AVClass exr_class = { const FFCodec ff_exr_encoder = { .p.name = "exr", - .p.long_name = NULL_IF_CONFIG_SMALL("OpenEXR image"), + CODEC_LONG_NAME("OpenEXR image"), .priv_data_size = sizeof(EXRContext), .p.priv_class = &exr_class, .p.type = AVMEDIA_TYPE_VIDEO, diff --git a/libavcodec/fastaudio.c b/libavcodec/fastaudio.c index 262e2bea7c..f5569f5206 100644 --- a/libavcodec/fastaudio.c +++ b/libavcodec/fastaudio.c @@ -186,7 +186,7 @@ static av_cold int fastaudio_close(AVCodecContext *avctx) const FFCodec ff_fastaudio_decoder = { .p.name = "fastaudio", - .p.long_name = NULL_IF_CONFIG_SMALL("MobiClip FastAudio"), + CODEC_LONG_NAME("MobiClip FastAudio"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_FASTAUDIO, .priv_data_size = sizeof(FastAudioContext), diff --git a/libavcodec/ffv1dec.c b/libavcodec/ffv1dec.c index fd549c7913..2fc8941362 100644 --- a/libavcodec/ffv1dec.c +++ b/libavcodec/ffv1dec.c @@ -1070,7 +1070,7 @@ static int update_thread_context(AVCodecContext *dst, const AVCodecContext *src) const FFCodec ff_ffv1_decoder = { .p.name = "ffv1", - .p.long_name = NULL_IF_CONFIG_SMALL("FFmpeg video codec #1"), + CODEC_LONG_NAME("FFmpeg video codec #1"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_FFV1, .priv_data_size = sizeof(FFV1Context), diff --git a/libavcodec/ffv1enc.c b/libavcodec/ffv1enc.c index 422bc1d231..0237ac48eb 100644 --- a/libavcodec/ffv1enc.c +++ b/libavcodec/ffv1enc.c @@ -1268,7 +1268,7 @@ static const AVClass ffv1_class = { const FFCodec ff_ffv1_encoder = { .p.name = "ffv1", - .p.long_name = NULL_IF_CONFIG_SMALL("FFmpeg video codec #1"), + CODEC_LONG_NAME("FFmpeg video codec #1"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_FFV1, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY | diff --git a/libavcodec/ffwavesynth.c b/libavcodec/ffwavesynth.c index 728650b057..b932326fd0 100644 --- a/libavcodec/ffwavesynth.c +++ b/libavcodec/ffwavesynth.c @@ -461,7 +461,7 @@ static av_cold int wavesynth_close(AVCodecContext *avc) const FFCodec ff_ffwavesynth_decoder = { .p.name = "wavesynth", - .p.long_name = NULL_IF_CONFIG_SMALL("Wave synthesis pseudo-codec"), + CODEC_LONG_NAME("Wave synthesis pseudo-codec"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_FFWAVESYNTH, .priv_data_size = sizeof(struct wavesynth_context), diff --git a/libavcodec/fic.c b/libavcodec/fic.c index cb536cf36e..94cf42887f 100644 --- a/libavcodec/fic.c +++ b/libavcodec/fic.c @@ -486,7 +486,7 @@ static const AVClass fic_decoder_class = { const FFCodec ff_fic_decoder = { .p.name = "fic", - .p.long_name = NULL_IF_CONFIG_SMALL("Mirillis FIC"), + CODEC_LONG_NAME("Mirillis FIC"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_FIC, .priv_data_size = sizeof(FICContext), diff --git a/libavcodec/fitsdec.c b/libavcodec/fitsdec.c index 7e45f2a65f..b9c51e70c3 100644 --- a/libavcodec/fitsdec.c +++ b/libavcodec/fitsdec.c @@ -326,7 +326,7 @@ const FFCodec ff_fits_decoder = { .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_FITS, .p.capabilities = AV_CODEC_CAP_DR1, - .p.long_name = NULL_IF_CONFIG_SMALL("Flexible Image Transport System"), + CODEC_LONG_NAME("Flexible Image Transport System"), .p.priv_class = &fits_decoder_class, .priv_data_size = sizeof(FITSContext), FF_CODEC_DECODE_CB(fits_decode_frame), diff --git a/libavcodec/fitsenc.c b/libavcodec/fitsenc.c index 30395b0a43..ac910499e5 100644 --- a/libavcodec/fitsenc.c +++ b/libavcodec/fitsenc.c @@ -111,7 +111,7 @@ static int fits_encode_frame(AVCodecContext *avctx, AVPacket *pkt, const FFCodec ff_fits_encoder = { .p.name = "fits", - .p.long_name = NULL_IF_CONFIG_SMALL("Flexible Image Transport System"), + CODEC_LONG_NAME("Flexible Image Transport System"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_FITS, .p.capabilities = AV_CODEC_CAP_DR1, diff --git a/libavcodec/flacdec.c b/libavcodec/flacdec.c index c5d9e95168..075d76bc8a 100644 --- a/libavcodec/flacdec.c +++ b/libavcodec/flacdec.c @@ -653,7 +653,7 @@ static const AVClass flac_decoder_class = { const FFCodec ff_flac_decoder = { .p.name = "flac", - .p.long_name = NULL_IF_CONFIG_SMALL("FLAC (Free Lossless Audio Codec)"), + CODEC_LONG_NAME("FLAC (Free Lossless Audio Codec)"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_FLAC, .priv_data_size = sizeof(FLACContext), diff --git a/libavcodec/flacenc.c b/libavcodec/flacenc.c index 0170e02ae8..5d8c3f82be 100644 --- a/libavcodec/flacenc.c +++ b/libavcodec/flacenc.c @@ -1486,7 +1486,7 @@ static const AVClass flac_encoder_class = { const FFCodec ff_flac_encoder = { .p.name = "flac", - .p.long_name = NULL_IF_CONFIG_SMALL("FLAC (Free Lossless Audio Codec)"), + CODEC_LONG_NAME("FLAC (Free Lossless Audio Codec)"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_FLAC, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY | diff --git a/libavcodec/flashsv.c b/libavcodec/flashsv.c index 76459df4cb..8a01e3a4b6 100644 --- a/libavcodec/flashsv.c +++ b/libavcodec/flashsv.c @@ -502,7 +502,7 @@ static int flashsv_decode_frame(AVCodecContext *avctx, AVFrame *rframe, #if CONFIG_FLASHSV_DECODER const FFCodec ff_flashsv_decoder = { .p.name = "flashsv", - .p.long_name = NULL_IF_CONFIG_SMALL("Flash Screen Video v1"), + CODEC_LONG_NAME("Flash Screen Video v1"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_FLASHSV, .priv_data_size = sizeof(FlashSVContext), @@ -570,7 +570,7 @@ static av_cold int flashsv2_decode_end(AVCodecContext *avctx) const FFCodec ff_flashsv2_decoder = { .p.name = "flashsv2", - .p.long_name = NULL_IF_CONFIG_SMALL("Flash Screen Video v2"), + CODEC_LONG_NAME("Flash Screen Video v2"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_FLASHSV2, .priv_data_size = sizeof(FlashSVContext), diff --git a/libavcodec/flashsv2enc.c b/libavcodec/flashsv2enc.c index a924092c52..668ca6a85f 100644 --- a/libavcodec/flashsv2enc.c +++ b/libavcodec/flashsv2enc.c @@ -912,7 +912,7 @@ static av_cold int flashsv2_encode_end(AVCodecContext * avctx) const FFCodec ff_flashsv2_encoder = { .p.name = "flashsv2", - .p.long_name = NULL_IF_CONFIG_SMALL("Flash Screen Video Version 2"), + CODEC_LONG_NAME("Flash Screen Video Version 2"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_FLASHSV2, .p.capabilities = AV_CODEC_CAP_DR1, diff --git a/libavcodec/flashsvenc.c b/libavcodec/flashsvenc.c index e6c9f640ae..35793400fa 100644 --- a/libavcodec/flashsvenc.c +++ b/libavcodec/flashsvenc.c @@ -258,7 +258,7 @@ static int flashsv_encode_frame(AVCodecContext *avctx, AVPacket *pkt, const FFCodec ff_flashsv_encoder = { .p.name = "flashsv", - .p.long_name = NULL_IF_CONFIG_SMALL("Flash Screen Video"), + CODEC_LONG_NAME("Flash Screen Video"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_FLASHSV, .p.capabilities = AV_CODEC_CAP_DR1, diff --git a/libavcodec/flicvideo.c b/libavcodec/flicvideo.c index e141d90a37..228f652775 100644 --- a/libavcodec/flicvideo.c +++ b/libavcodec/flicvideo.c @@ -1104,7 +1104,7 @@ static av_cold int flic_decode_end(AVCodecContext *avctx) const FFCodec ff_flic_decoder = { .p.name = "flic", - .p.long_name = NULL_IF_CONFIG_SMALL("Autodesk Animator Flic video"), + CODEC_LONG_NAME("Autodesk Animator Flic video"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_FLIC, .priv_data_size = sizeof(FlicDecodeContext), diff --git a/libavcodec/flvdec.c b/libavcodec/flvdec.c index a9910482a9..87c5e923ea 100644 --- a/libavcodec/flvdec.c +++ b/libavcodec/flvdec.c @@ -115,7 +115,7 @@ int ff_flv_decode_picture_header(MpegEncContext *s) const FFCodec ff_flv_decoder = { .p.name = "flv", - .p.long_name = NULL_IF_CONFIG_SMALL("FLV / Sorenson Spark / Sorenson H.263 (Flash Video)"), + CODEC_LONG_NAME("FLV / Sorenson Spark / Sorenson H.263 (Flash Video)"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_FLV1, .priv_data_size = sizeof(MpegEncContext), diff --git a/libavcodec/flvenc.c b/libavcodec/flvenc.c index 453182b109..b49ca2e0d5 100644 --- a/libavcodec/flvenc.c +++ b/libavcodec/flvenc.c @@ -94,7 +94,7 @@ void ff_flv2_encode_ac_esc(PutBitContext *pb, int slevel, int level, const FFCodec ff_flv_encoder = { .p.name = "flv", - .p.long_name = NULL_IF_CONFIG_SMALL("FLV / Sorenson Spark / Sorenson H.263 (Flash Video)"), + CODEC_LONG_NAME("FLV / Sorenson Spark / Sorenson H.263 (Flash Video)"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_FLV1, .p.priv_class = &ff_mpv_enc_class, diff --git a/libavcodec/fmvc.c b/libavcodec/fmvc.c index b3a4e7184c..863c65c351 100644 --- a/libavcodec/fmvc.c +++ b/libavcodec/fmvc.c @@ -627,7 +627,7 @@ static av_cold int decode_close(AVCodecContext *avctx) const FFCodec ff_fmvc_decoder = { .p.name = "fmvc", - .p.long_name = NULL_IF_CONFIG_SMALL("FM Screen Capture Codec"), + CODEC_LONG_NAME("FM Screen Capture Codec"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_FMVC, .priv_data_size = sizeof(FMVCContext), diff --git a/libavcodec/fraps.c b/libavcodec/fraps.c index 92a1963d12..9c8cbf7323 100644 --- a/libavcodec/fraps.c +++ b/libavcodec/fraps.c @@ -341,7 +341,7 @@ static av_cold int decode_end(AVCodecContext *avctx) const FFCodec ff_fraps_decoder = { .p.name = "fraps", - .p.long_name = NULL_IF_CONFIG_SMALL("Fraps"), + CODEC_LONG_NAME("Fraps"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_FRAPS, .priv_data_size = sizeof(FrapsContext), diff --git a/libavcodec/frwu.c b/libavcodec/frwu.c index 225667b4c4..cf183f8410 100644 --- a/libavcodec/frwu.c +++ b/libavcodec/frwu.c @@ -117,7 +117,7 @@ static const AVClass frwu_class = { const FFCodec ff_frwu_decoder = { .p.name = "frwu", - .p.long_name = NULL_IF_CONFIG_SMALL("Forward Uncompressed"), + CODEC_LONG_NAME("Forward Uncompressed"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_FRWU, .priv_data_size = sizeof(FRWUContext), diff --git a/libavcodec/g2meet.c b/libavcodec/g2meet.c index 154ff10aad..080544de8b 100644 --- a/libavcodec/g2meet.c +++ b/libavcodec/g2meet.c @@ -1622,7 +1622,7 @@ static av_cold int g2m_decode_end(AVCodecContext *avctx) const FFCodec ff_g2m_decoder = { .p.name = "g2m", - .p.long_name = NULL_IF_CONFIG_SMALL("Go2Meeting"), + CODEC_LONG_NAME("Go2Meeting"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_G2M, .priv_data_size = sizeof(G2MContext), diff --git a/libavcodec/g722dec.c b/libavcodec/g722dec.c index 23598cb71f..231f1d32eb 100644 --- a/libavcodec/g722dec.c +++ b/libavcodec/g722dec.c @@ -141,7 +141,7 @@ static int g722_decode_frame(AVCodecContext *avctx, AVFrame *frame, const FFCodec ff_adpcm_g722_decoder = { .p.name = "g722", - .p.long_name = NULL_IF_CONFIG_SMALL("G.722 ADPCM"), + CODEC_LONG_NAME("G.722 ADPCM"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_ADPCM_G722, .priv_data_size = sizeof(G722Context), diff --git a/libavcodec/g722enc.c b/libavcodec/g722enc.c index 7ba283df61..dc044c320d 100644 --- a/libavcodec/g722enc.c +++ b/libavcodec/g722enc.c @@ -372,7 +372,7 @@ static int g722_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, const FFCodec ff_adpcm_g722_encoder = { .p.name = "g722", - .p.long_name = NULL_IF_CONFIG_SMALL("G.722 ADPCM"), + CODEC_LONG_NAME("G.722 ADPCM"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_ADPCM_G722, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_SMALL_LAST_FRAME, diff --git a/libavcodec/g723_1dec.c b/libavcodec/g723_1dec.c index 3904840eba..55e20de5b5 100644 --- a/libavcodec/g723_1dec.c +++ b/libavcodec/g723_1dec.c @@ -1112,7 +1112,7 @@ static const AVClass g723_1dec_class = { const FFCodec ff_g723_1_decoder = { .p.name = "g723_1", - .p.long_name = NULL_IF_CONFIG_SMALL("G.723.1"), + CODEC_LONG_NAME("G.723.1"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_G723_1, .priv_data_size = sizeof(G723_1_Context), diff --git a/libavcodec/g723_1enc.c b/libavcodec/g723_1enc.c index 4dc5dcd13a..f3baf7b4ec 100644 --- a/libavcodec/g723_1enc.c +++ b/libavcodec/g723_1enc.c @@ -1240,7 +1240,7 @@ static const FFCodecDefault defaults[] = { const FFCodec ff_g723_1_encoder = { .p.name = "g723_1", - .p.long_name = NULL_IF_CONFIG_SMALL("G.723.1"), + CODEC_LONG_NAME("G.723.1"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_G723_1, .p.capabilities = AV_CODEC_CAP_DR1, diff --git a/libavcodec/g726.c b/libavcodec/g726.c index 320bc55d15..7bbb7f900c 100644 --- a/libavcodec/g726.c +++ b/libavcodec/g726.c @@ -402,7 +402,7 @@ static const FFCodecDefault defaults[] = { #if CONFIG_ADPCM_G726_ENCODER const FFCodec ff_adpcm_g726_encoder = { .p.name = "g726", - .p.long_name = NULL_IF_CONFIG_SMALL("G.726 ADPCM"), + CODEC_LONG_NAME("G.726 ADPCM"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_ADPCM_G726, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_SMALL_LAST_FRAME, @@ -419,7 +419,7 @@ const FFCodec ff_adpcm_g726_encoder = { #if CONFIG_ADPCM_G726LE_ENCODER const FFCodec ff_adpcm_g726le_encoder = { .p.name = "g726le", - .p.long_name = NULL_IF_CONFIG_SMALL("G.726 little endian ADPCM (\"right-justified\")"), + CODEC_LONG_NAME("G.726 little endian ADPCM (\"right-justified\")"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_ADPCM_G726LE, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_SMALL_LAST_FRAME, @@ -502,7 +502,7 @@ static void g726_decode_flush(AVCodecContext *avctx) #if CONFIG_ADPCM_G726_DECODER const FFCodec ff_adpcm_g726_decoder = { .p.name = "g726", - .p.long_name = NULL_IF_CONFIG_SMALL("G.726 ADPCM"), + CODEC_LONG_NAME("G.726 ADPCM"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_ADPCM_G726, .priv_data_size = sizeof(G726Context), @@ -523,6 +523,6 @@ const FFCodec ff_adpcm_g726le_decoder = { FF_CODEC_DECODE_CB(g726_decode_frame), .flush = g726_decode_flush, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_CHANNEL_CONF, - .p.long_name = NULL_IF_CONFIG_SMALL("G.726 ADPCM little-endian"), + CODEC_LONG_NAME("G.726 ADPCM little-endian"), }; #endif diff --git a/libavcodec/g729dec.c b/libavcodec/g729dec.c index bcaee44d9d..f783812cc7 100644 --- a/libavcodec/g729dec.c +++ b/libavcodec/g729dec.c @@ -753,7 +753,7 @@ static av_cold int decode_close(AVCodecContext *avctx) const FFCodec ff_g729_decoder = { .p.name = "g729", - .p.long_name = NULL_IF_CONFIG_SMALL("G.729"), + CODEC_LONG_NAME("G.729"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_G729, .priv_data_size = sizeof(G729Context), @@ -765,7 +765,7 @@ const FFCodec ff_g729_decoder = { const FFCodec ff_acelp_kelvin_decoder = { .p.name = "acelp.kelvin", - .p.long_name = NULL_IF_CONFIG_SMALL("Sipro ACELP.KELVIN"), + CODEC_LONG_NAME("Sipro ACELP.KELVIN"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_ACELP_KELVIN, .priv_data_size = sizeof(G729Context), diff --git a/libavcodec/gdv.c b/libavcodec/gdv.c index 19b4d4bdbb..e114f3e80f 100644 --- a/libavcodec/gdv.c +++ b/libavcodec/gdv.c @@ -561,7 +561,7 @@ static av_cold int gdv_decode_close(AVCodecContext *avctx) const FFCodec ff_gdv_decoder = { .p.name = "gdv", - .p.long_name = NULL_IF_CONFIG_SMALL("Gremlin Digital Video"), + CODEC_LONG_NAME("Gremlin Digital Video"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_GDV, .priv_data_size = sizeof(GDVContext), diff --git a/libavcodec/gemdec.c b/libavcodec/gemdec.c index 5533f981dc..c8fd8dcdcd 100644 --- a/libavcodec/gemdec.c +++ b/libavcodec/gemdec.c @@ -352,7 +352,7 @@ static av_cold int gem_close(AVCodecContext *avctx) const FFCodec ff_gem_decoder = { .p.name = "gem", - .p.long_name = NULL_IF_CONFIG_SMALL("GEM Raster image"), + CODEC_LONG_NAME("GEM Raster image"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_GEM, .p.capabilities = AV_CODEC_CAP_DR1, diff --git a/libavcodec/gif.c b/libavcodec/gif.c index 6adbf880ae..7e717d8220 100644 --- a/libavcodec/gif.c +++ b/libavcodec/gif.c @@ -550,7 +550,7 @@ static const AVClass gif_class = { const FFCodec ff_gif_encoder = { .p.name = "gif", - .p.long_name = NULL_IF_CONFIG_SMALL("GIF (Graphics Interchange Format)"), + CODEC_LONG_NAME("GIF (Graphics Interchange Format)"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_GIF, .p.capabilities = AV_CODEC_CAP_DR1, diff --git a/libavcodec/gifdec.c b/libavcodec/gifdec.c index d8638a37be..f47390c3bd 100644 --- a/libavcodec/gifdec.c +++ b/libavcodec/gifdec.c @@ -557,7 +557,7 @@ static const AVClass decoder_class = { const FFCodec ff_gif_decoder = { .p.name = "gif", - .p.long_name = NULL_IF_CONFIG_SMALL("GIF (Graphics Interchange Format)"), + CODEC_LONG_NAME("GIF (Graphics Interchange Format)"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_GIF, .priv_data_size = sizeof(GifState), diff --git a/libavcodec/gsmdec.c b/libavcodec/gsmdec.c index c44c9d992f..14e2364345 100644 --- a/libavcodec/gsmdec.c +++ b/libavcodec/gsmdec.c @@ -115,7 +115,7 @@ static void gsm_flush(AVCodecContext *avctx) #if CONFIG_GSM_DECODER const FFCodec ff_gsm_decoder = { .p.name = "gsm", - .p.long_name = NULL_IF_CONFIG_SMALL("GSM"), + CODEC_LONG_NAME("GSM"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_GSM, .priv_data_size = sizeof(GSMContext), @@ -128,7 +128,7 @@ const FFCodec ff_gsm_decoder = { #if CONFIG_GSM_MS_DECODER const FFCodec ff_gsm_ms_decoder = { .p.name = "gsm_ms", - .p.long_name = NULL_IF_CONFIG_SMALL("GSM Microsoft variant"), + CODEC_LONG_NAME("GSM Microsoft variant"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_GSM_MS, .priv_data_size = sizeof(GSMContext), diff --git a/libavcodec/h261dec.c b/libavcodec/h261dec.c index 70a26f443d..5e4f298291 100644 --- a/libavcodec/h261dec.c +++ b/libavcodec/h261dec.c @@ -682,7 +682,7 @@ static av_cold int h261_decode_end(AVCodecContext *avctx) const FFCodec ff_h261_decoder = { .p.name = "h261", - .p.long_name = NULL_IF_CONFIG_SMALL("H.261"), + CODEC_LONG_NAME("H.261"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_H261, .priv_data_size = sizeof(H261DecContext), diff --git a/libavcodec/h261enc.c b/libavcodec/h261enc.c index a1fba968a4..b868827160 100644 --- a/libavcodec/h261enc.c +++ b/libavcodec/h261enc.c @@ -402,7 +402,7 @@ av_cold void ff_h261_encode_init(MpegEncContext *s) const FFCodec ff_h261_encoder = { .p.name = "h261", - .p.long_name = NULL_IF_CONFIG_SMALL("H.261"), + CODEC_LONG_NAME("H.261"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_H261, .p.priv_class = &ff_mpv_enc_class, diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index a08329a121..90dd32bd3a 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -749,7 +749,7 @@ static const AVCodecHWConfigInternal *const h263_hw_config_list[] = { const FFCodec ff_h263_decoder = { .p.name = "h263", - .p.long_name = NULL_IF_CONFIG_SMALL("H.263 / H.263-1996, H.263+ / H.263-1998 / H.263 version 2"), + CODEC_LONG_NAME("H.263 / H.263-1996, H.263+ / H.263-1998 / H.263 version 2"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_H263, .priv_data_size = sizeof(MpegEncContext), @@ -770,7 +770,7 @@ const FFCodec ff_h263_decoder = { const FFCodec ff_h263p_decoder = { .p.name = "h263p", - .p.long_name = NULL_IF_CONFIG_SMALL("H.263 / H.263-1996, H.263+ / H.263-1998 / H.263 version 2"), + CODEC_LONG_NAME("H.263 / H.263-1996, H.263+ / H.263-1998 / H.263 version 2"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_H263P, .priv_data_size = sizeof(MpegEncContext), diff --git a/libavcodec/h264dec.c b/libavcodec/h264dec.c index fc7b2c7f78..3cef3f39f5 100644 --- a/libavcodec/h264dec.c +++ b/libavcodec/h264dec.c @@ -1068,7 +1068,7 @@ static const AVClass h264_class = { const FFCodec ff_h264_decoder = { .p.name = "h264", - .p.long_name = NULL_IF_CONFIG_SMALL("H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10"), + CODEC_LONG_NAME("H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_H264, .priv_data_size = sizeof(H264Context), diff --git a/libavcodec/hapdec.c b/libavcodec/hapdec.c index beb068830d..3df69e6335 100644 --- a/libavcodec/hapdec.c +++ b/libavcodec/hapdec.c @@ -414,7 +414,7 @@ static av_cold int hap_close(AVCodecContext *avctx) const FFCodec ff_hap_decoder = { .p.name = "hap", - .p.long_name = NULL_IF_CONFIG_SMALL("Vidvox Hap"), + CODEC_LONG_NAME("Vidvox Hap"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_HAP, .init = hap_init, diff --git a/libavcodec/hapenc.c b/libavcodec/hapenc.c index fc533164c4..a890dc6492 100644 --- a/libavcodec/hapenc.c +++ b/libavcodec/hapenc.c @@ -348,7 +348,7 @@ static const AVClass hapenc_class = { const FFCodec ff_hap_encoder = { .p.name = "hap", - .p.long_name = NULL_IF_CONFIG_SMALL("Vidvox Hap"), + CODEC_LONG_NAME("Vidvox Hap"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_HAP, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_SLICE_THREADS, diff --git a/libavcodec/hcadec.c b/libavcodec/hcadec.c index 82276589fc..2f019a8214 100644 --- a/libavcodec/hcadec.c +++ b/libavcodec/hcadec.c @@ -441,7 +441,7 @@ static av_cold int decode_close(AVCodecContext *avctx) const FFCodec ff_hca_decoder = { .p.name = "hca", - .p.long_name = NULL_IF_CONFIG_SMALL("CRI HCA"), + CODEC_LONG_NAME("CRI HCA"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_HCA, .priv_data_size = sizeof(HCAContext), diff --git a/libavcodec/hcom.c b/libavcodec/hcom.c index 301b1e02d6..9284cd11c9 100644 --- a/libavcodec/hcom.c +++ b/libavcodec/hcom.c @@ -136,7 +136,7 @@ static av_cold int hcom_close(AVCodecContext *avctx) const FFCodec ff_hcom_decoder = { .p.name = "hcom", - .p.long_name = NULL_IF_CONFIG_SMALL("HCOM Audio"), + CODEC_LONG_NAME("HCOM Audio"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_HCOM, .priv_data_size = sizeof(HCOMContext), diff --git a/libavcodec/hdrdec.c b/libavcodec/hdrdec.c index 9079e4a843..9b262f2ef2 100644 --- a/libavcodec/hdrdec.c +++ b/libavcodec/hdrdec.c @@ -211,7 +211,7 @@ convert: const FFCodec ff_hdr_decoder = { .p.name = "hdr", - .p.long_name = NULL_IF_CONFIG_SMALL("HDR (Radiance RGBE format) image"), + CODEC_LONG_NAME("HDR (Radiance RGBE format) image"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_RADIANCE_HDR, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS, diff --git a/libavcodec/hdrenc.c b/libavcodec/hdrenc.c index 0da89c092d..d8c3111c93 100644 --- a/libavcodec/hdrenc.c +++ b/libavcodec/hdrenc.c @@ -173,7 +173,7 @@ static int hdr_encode_frame(AVCodecContext *avctx, AVPacket *pkt, const FFCodec ff_hdr_encoder = { .p.name = "hdr", - .p.long_name = NULL_IF_CONFIG_SMALL("HDR (Radiance RGBE format) image"), + CODEC_LONG_NAME("HDR (Radiance RGBE format) image"), .priv_data_size = sizeof(HDREncContext), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_RADIANCE_HDR, diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c index ed6cef6bfb..91bafa2114 100644 --- a/libavcodec/hevcdec.c +++ b/libavcodec/hevcdec.c @@ -3845,7 +3845,7 @@ static const AVClass hevc_decoder_class = { const FFCodec ff_hevc_decoder = { .p.name = "hevc", - .p.long_name = NULL_IF_CONFIG_SMALL("HEVC (High Efficiency Video Coding)"), + CODEC_LONG_NAME("HEVC (High Efficiency Video Coding)"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_HEVC, .priv_data_size = sizeof(HEVCContext), diff --git a/libavcodec/hnm4video.c b/libavcodec/hnm4video.c index f68badf195..f223bb82fc 100644 --- a/libavcodec/hnm4video.c +++ b/libavcodec/hnm4video.c @@ -499,7 +499,7 @@ static av_cold int hnm_decode_end(AVCodecContext *avctx) const FFCodec ff_hnm4_video_decoder = { .p.name = "hnm4video", - .p.long_name = NULL_IF_CONFIG_SMALL("HNM 4 video"), + CODEC_LONG_NAME("HNM 4 video"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_HNM4_VIDEO, .priv_data_size = sizeof(Hnm4VideoContext), diff --git a/libavcodec/hq_hqa.c b/libavcodec/hq_hqa.c index 075c74d105..6ce73b7ae4 100644 --- a/libavcodec/hq_hqa.c +++ b/libavcodec/hq_hqa.c @@ -384,7 +384,7 @@ static av_cold int hq_hqa_decode_close(AVCodecContext *avctx) const FFCodec ff_hq_hqa_decoder = { .p.name = "hq_hqa", - .p.long_name = NULL_IF_CONFIG_SMALL("Canopus HQ/HQA"), + CODEC_LONG_NAME("Canopus HQ/HQA"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_HQ_HQA, .priv_data_size = sizeof(HQContext), diff --git a/libavcodec/hqx.c b/libavcodec/hqx.c index c7ba6afc83..6083946550 100644 --- a/libavcodec/hqx.c +++ b/libavcodec/hqx.c @@ -536,7 +536,7 @@ static av_cold int hqx_decode_init(AVCodecContext *avctx) const FFCodec ff_hqx_decoder = { .p.name = "hqx", - .p.long_name = NULL_IF_CONFIG_SMALL("Canopus HQX"), + CODEC_LONG_NAME("Canopus HQX"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_HQX, .priv_data_size = sizeof(HQXContext), diff --git a/libavcodec/huffyuvdec.c b/libavcodec/huffyuvdec.c index a9d63acb15..fce7497386 100644 --- a/libavcodec/huffyuvdec.c +++ b/libavcodec/huffyuvdec.c @@ -1264,7 +1264,7 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *p, const FFCodec ff_huffyuv_decoder = { .p.name = "huffyuv", - .p.long_name = NULL_IF_CONFIG_SMALL("Huffyuv / HuffYUV"), + CODEC_LONG_NAME("Huffyuv / HuffYUV"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_HUFFYUV, .priv_data_size = sizeof(HYuvContext), @@ -1279,7 +1279,7 @@ const FFCodec ff_huffyuv_decoder = { #if CONFIG_FFVHUFF_DECODER const FFCodec ff_ffvhuff_decoder = { .p.name = "ffvhuff", - .p.long_name = NULL_IF_CONFIG_SMALL("Huffyuv FFmpeg variant"), + CODEC_LONG_NAME("Huffyuv FFmpeg variant"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_FFVHUFF, .priv_data_size = sizeof(HYuvContext), @@ -1295,7 +1295,7 @@ const FFCodec ff_ffvhuff_decoder = { #if CONFIG_HYMT_DECODER const FFCodec ff_hymt_decoder = { .p.name = "hymt", - .p.long_name = NULL_IF_CONFIG_SMALL("HuffYUV MT"), + CODEC_LONG_NAME("HuffYUV MT"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_HYMT, .priv_data_size = sizeof(HYuvContext), diff --git a/libavcodec/huffyuvenc.c b/libavcodec/huffyuvenc.c index 9e4a1ddfba..2d63b12abc 100644 --- a/libavcodec/huffyuvenc.c +++ b/libavcodec/huffyuvenc.c @@ -1051,7 +1051,7 @@ static const AVClass ff_class = { const FFCodec ff_huffyuv_encoder = { .p.name = "huffyuv", - .p.long_name = NULL_IF_CONFIG_SMALL("Huffyuv / HuffYUV"), + CODEC_LONG_NAME("Huffyuv / HuffYUV"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_HUFFYUV, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS, @@ -1070,7 +1070,7 @@ const FFCodec ff_huffyuv_encoder = { #if CONFIG_FFVHUFF_ENCODER const FFCodec ff_ffvhuff_encoder = { .p.name = "ffvhuff", - .p.long_name = NULL_IF_CONFIG_SMALL("Huffyuv FFmpeg variant"), + CODEC_LONG_NAME("Huffyuv FFmpeg variant"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_FFVHUFF, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS, diff --git a/libavcodec/idcinvideo.c b/libavcodec/idcinvideo.c index 4d3bcd3e86..f6b8b3cd69 100644 --- a/libavcodec/idcinvideo.c +++ b/libavcodec/idcinvideo.c @@ -241,7 +241,7 @@ static const FFCodecDefault idcin_defaults[] = { const FFCodec ff_idcin_decoder = { .p.name = "idcinvideo", - .p.long_name = NULL_IF_CONFIG_SMALL("id Quake II CIN video"), + CODEC_LONG_NAME("id Quake II CIN video"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_IDCIN, .priv_data_size = sizeof(IdcinContext), diff --git a/libavcodec/iff.c b/libavcodec/iff.c index e31dc4cbd0..6c0f031238 100644 --- a/libavcodec/iff.c +++ b/libavcodec/iff.c @@ -1907,7 +1907,7 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *frame, const FFCodec ff_iff_ilbm_decoder = { .p.name = "iff", - .p.long_name = NULL_IF_CONFIG_SMALL("IFF ACBM/ANIM/DEEP/ILBM/PBM/RGB8/RGBN"), + CODEC_LONG_NAME("IFF ACBM/ANIM/DEEP/ILBM/PBM/RGB8/RGBN"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_IFF_ILBM, .priv_data_size = sizeof(IffContext), diff --git a/libavcodec/ilbcdec.c b/libavcodec/ilbcdec.c index 1ee59ef5c9..4ecdff4183 100644 --- a/libavcodec/ilbcdec.c +++ b/libavcodec/ilbcdec.c @@ -1480,7 +1480,7 @@ static av_cold int ilbc_decode_init(AVCodecContext *avctx) const FFCodec ff_ilbc_decoder = { .p.name = "ilbc", - .p.long_name = NULL_IF_CONFIG_SMALL("iLBC (Internet Low Bitrate Codec)"), + CODEC_LONG_NAME("iLBC (Internet Low Bitrate Codec)"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_ILBC, .init = ilbc_decode_init, diff --git a/libavcodec/imc.c b/libavcodec/imc.c index e751c1da8d..92f9980ded 100644 --- a/libavcodec/imc.c +++ b/libavcodec/imc.c @@ -1083,7 +1083,7 @@ static av_cold void flush(AVCodecContext *avctx) #if CONFIG_IMC_DECODER const FFCodec ff_imc_decoder = { .p.name = "imc", - .p.long_name = NULL_IF_CONFIG_SMALL("IMC (Intel Music Coder)"), + CODEC_LONG_NAME("IMC (Intel Music Coder)"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_IMC, .priv_data_size = sizeof(IMCContext), @@ -1099,7 +1099,7 @@ const FFCodec ff_imc_decoder = { #if CONFIG_IAC_DECODER const FFCodec ff_iac_decoder = { .p.name = "iac", - .p.long_name = NULL_IF_CONFIG_SMALL("IAC (Indeo Audio Coder)"), + CODEC_LONG_NAME("IAC (Indeo Audio Coder)"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_IAC, .priv_data_size = sizeof(IMCContext), diff --git a/libavcodec/imm4.c b/libavcodec/imm4.c index 96a395a100..e2aa20813a 100644 --- a/libavcodec/imm4.c +++ b/libavcodec/imm4.c @@ -533,7 +533,7 @@ static av_cold int decode_close(AVCodecContext *avctx) const FFCodec ff_imm4_decoder = { .p.name = "imm4", - .p.long_name = NULL_IF_CONFIG_SMALL("Infinity IMM4"), + CODEC_LONG_NAME("Infinity IMM4"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_IMM4, .priv_data_size = sizeof(IMM4Context), diff --git a/libavcodec/imm5.c b/libavcodec/imm5.c index 2c85bcc54a..2535e7726c 100644 --- a/libavcodec/imm5.c +++ b/libavcodec/imm5.c @@ -179,7 +179,7 @@ static av_cold int imm5_close(AVCodecContext *avctx) const FFCodec ff_imm5_decoder = { .p.name = "imm5", - .p.long_name = NULL_IF_CONFIG_SMALL("Infinity IMM5"), + CODEC_LONG_NAME("Infinity IMM5"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_IMM5, .init = imm5_init, diff --git a/libavcodec/imx.c b/libavcodec/imx.c index 68fdbc4ae9..44bab23c27 100644 --- a/libavcodec/imx.c +++ b/libavcodec/imx.c @@ -181,7 +181,7 @@ static int imx_decode_close(AVCodecContext *avctx) const FFCodec ff_simbiosis_imx_decoder = { .p.name = "simbiosis_imx", - .p.long_name = NULL_IF_CONFIG_SMALL("Simbiosis Interactive IMX Video"), + CODEC_LONG_NAME("Simbiosis Interactive IMX Video"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_SIMBIOSIS_IMX, .priv_data_size = sizeof(SimbiosisIMXContext), diff --git a/libavcodec/indeo2.c b/libavcodec/indeo2.c index 8a4b1a584a..dd88ebf7c5 100644 --- a/libavcodec/indeo2.c +++ b/libavcodec/indeo2.c @@ -260,7 +260,7 @@ static av_cold int ir2_decode_end(AVCodecContext *avctx) const FFCodec ff_indeo2_decoder = { .p.name = "indeo2", - .p.long_name = NULL_IF_CONFIG_SMALL("Intel Indeo 2"), + CODEC_LONG_NAME("Intel Indeo 2"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_INDEO2, .priv_data_size = sizeof(Ir2Context), diff --git a/libavcodec/indeo3.c b/libavcodec/indeo3.c index a41608bb7e..5f1014f0d4 100644 --- a/libavcodec/indeo3.c +++ b/libavcodec/indeo3.c @@ -1135,7 +1135,7 @@ static av_cold int decode_close(AVCodecContext *avctx) const FFCodec ff_indeo3_decoder = { .p.name = "indeo3", - .p.long_name = NULL_IF_CONFIG_SMALL("Intel Indeo 3"), + CODEC_LONG_NAME("Intel Indeo 3"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_INDEO3, .priv_data_size = sizeof(Indeo3DecodeContext), diff --git a/libavcodec/indeo4.c b/libavcodec/indeo4.c index b612c88ccf..64dfc7cce1 100644 --- a/libavcodec/indeo4.c +++ b/libavcodec/indeo4.c @@ -705,7 +705,7 @@ static av_cold int decode_init(AVCodecContext *avctx) const FFCodec ff_indeo4_decoder = { .p.name = "indeo4", - .p.long_name = NULL_IF_CONFIG_SMALL("Intel Indeo Video Interactive 4"), + CODEC_LONG_NAME("Intel Indeo Video Interactive 4"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_INDEO4, .priv_data_size = sizeof(IVI45DecContext), diff --git a/libavcodec/indeo5.c b/libavcodec/indeo5.c index 1f799fdbc0..df95064e3f 100644 --- a/libavcodec/indeo5.c +++ b/libavcodec/indeo5.c @@ -685,7 +685,7 @@ static av_cold int decode_init(AVCodecContext *avctx) const FFCodec ff_indeo5_decoder = { .p.name = "indeo5", - .p.long_name = NULL_IF_CONFIG_SMALL("Intel Indeo Video Interactive 5"), + CODEC_LONG_NAME("Intel Indeo Video Interactive 5"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_INDEO5, .priv_data_size = sizeof(IVI45DecContext), diff --git a/libavcodec/intelh263dec.c b/libavcodec/intelh263dec.c index 9fb1155691..453b93f16c 100644 --- a/libavcodec/intelh263dec.c +++ b/libavcodec/intelh263dec.c @@ -132,7 +132,7 @@ int ff_intel_h263_decode_picture_header(MpegEncContext *s) const FFCodec ff_h263i_decoder = { .p.name = "h263i", - .p.long_name = NULL_IF_CONFIG_SMALL("Intel H.263"), + CODEC_LONG_NAME("Intel H.263"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_H263I, .priv_data_size = sizeof(MpegEncContext), diff --git a/libavcodec/interplayacm.c b/libavcodec/interplayacm.c index 069b1ca704..a0b9655e7a 100644 --- a/libavcodec/interplayacm.c +++ b/libavcodec/interplayacm.c @@ -634,7 +634,7 @@ static av_cold int decode_close(AVCodecContext *avctx) const FFCodec ff_interplay_acm_decoder = { .p.name = "interplayacm", - .p.long_name = NULL_IF_CONFIG_SMALL("Interplay ACM"), + CODEC_LONG_NAME("Interplay ACM"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_INTERPLAY_ACM, .init = decode_init, diff --git a/libavcodec/interplayvideo.c b/libavcodec/interplayvideo.c index 21ceb75210..655326a7f1 100644 --- a/libavcodec/interplayvideo.c +++ b/libavcodec/interplayvideo.c @@ -1356,7 +1356,7 @@ static av_cold int ipvideo_decode_end(AVCodecContext *avctx) const FFCodec ff_interplay_video_decoder = { .p.name = "interplayvideo", - .p.long_name = NULL_IF_CONFIG_SMALL("Interplay MVE video"), + CODEC_LONG_NAME("Interplay MVE video"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_INTERPLAY_VIDEO, .priv_data_size = sizeof(IpvideoContext), diff --git a/libavcodec/ituh263enc.c b/libavcodec/ituh263enc.c index e43cb33ea2..22e5a8368d 100644 --- a/libavcodec/ituh263enc.c +++ b/libavcodec/ituh263enc.c @@ -898,7 +898,7 @@ static const AVClass h263_class = { const FFCodec ff_h263_encoder = { .p.name = "h263", - .p.long_name = NULL_IF_CONFIG_SMALL("H.263 / H.263-1996"), + CODEC_LONG_NAME("H.263 / H.263-1996"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_H263, .p.pix_fmts = (const enum AVPixelFormat[]){AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE}, @@ -928,7 +928,7 @@ static const AVClass h263p_class = { const FFCodec ff_h263p_encoder = { .p.name = "h263p", - .p.long_name = NULL_IF_CONFIG_SMALL("H.263+ / H.263-1998 / H.263 version 2"), + CODEC_LONG_NAME("H.263+ / H.263-1998 / H.263 version 2"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_H263P, .p.pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE }, diff --git a/libavcodec/j2kenc.c b/libavcodec/j2kenc.c index 5e6872080c..e883d5deb7 100644 --- a/libavcodec/j2kenc.c +++ b/libavcodec/j2kenc.c @@ -1832,7 +1832,7 @@ static const AVClass j2k_class = { const FFCodec ff_jpeg2000_encoder = { .p.name = "jpeg2000", - .p.long_name = NULL_IF_CONFIG_SMALL("JPEG 2000"), + CODEC_LONG_NAME("JPEG 2000"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_JPEG2000, .p.capabilities = AV_CODEC_CAP_DR1, diff --git a/libavcodec/jacosubdec.c b/libavcodec/jacosubdec.c index 8dcc38e651..08349a9ec8 100644 --- a/libavcodec/jacosubdec.c +++ b/libavcodec/jacosubdec.c @@ -195,7 +195,7 @@ end: const FFCodec ff_jacosub_decoder = { .p.name = "jacosub", - .p.long_name = NULL_IF_CONFIG_SMALL("JACOsub subtitle"), + CODEC_LONG_NAME("JACOsub subtitle"), .p.type = AVMEDIA_TYPE_SUBTITLE, .p.id = AV_CODEC_ID_JACOSUB, .init = ff_ass_subtitle_header_default, diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index 2c1191035c..7d9661f29f 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -2576,7 +2576,7 @@ static const AVClass jpeg2000_class = { const FFCodec ff_jpeg2000_decoder = { .p.name = "jpeg2000", - .p.long_name = NULL_IF_CONFIG_SMALL("JPEG 2000"), + CODEC_LONG_NAME("JPEG 2000"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_JPEG2000, .p.capabilities = AV_CODEC_CAP_SLICE_THREADS | AV_CODEC_CAP_FRAME_THREADS | AV_CODEC_CAP_DR1, diff --git a/libavcodec/jpeglsdec.c b/libavcodec/jpeglsdec.c index 984cc3b414..2e6d018ea6 100644 --- a/libavcodec/jpeglsdec.c +++ b/libavcodec/jpeglsdec.c @@ -552,7 +552,7 @@ end: const FFCodec ff_jpegls_decoder = { .p.name = "jpegls", - .p.long_name = NULL_IF_CONFIG_SMALL("JPEG-LS"), + CODEC_LONG_NAME("JPEG-LS"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_JPEGLS, .priv_data_size = sizeof(MJpegDecodeContext), diff --git a/libavcodec/jpeglsenc.c b/libavcodec/jpeglsenc.c index 8f3197e687..5ee39ac2d6 100644 --- a/libavcodec/jpeglsenc.c +++ b/libavcodec/jpeglsenc.c @@ -473,7 +473,7 @@ static const AVClass jpegls_class = { const FFCodec ff_jpegls_encoder = { .p.name = "jpegls", - .p.long_name = NULL_IF_CONFIG_SMALL("JPEG-LS"), + CODEC_LONG_NAME("JPEG-LS"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_JPEGLS, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS, diff --git a/libavcodec/jvdec.c b/libavcodec/jvdec.c index 9bca18e32c..dd7e4a93ef 100644 --- a/libavcodec/jvdec.c +++ b/libavcodec/jvdec.c @@ -236,7 +236,7 @@ static av_cold int decode_close(AVCodecContext *avctx) const FFCodec ff_jv_decoder = { .p.name = "jv", - .p.long_name = NULL_IF_CONFIG_SMALL("Bitmap Brothers JV video"), + CODEC_LONG_NAME("Bitmap Brothers JV video"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_JV, .priv_data_size = sizeof(JvContext), diff --git a/libavcodec/kgv1dec.c b/libavcodec/kgv1dec.c index 11dfc1b84f..139ec9b05e 100644 --- a/libavcodec/kgv1dec.c +++ b/libavcodec/kgv1dec.c @@ -178,7 +178,7 @@ static av_cold int decode_end(AVCodecContext *avctx) const FFCodec ff_kgv1_decoder = { .p.name = "kgv1", - .p.long_name = NULL_IF_CONFIG_SMALL("Kega Game Video"), + CODEC_LONG_NAME("Kega Game Video"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_KGV1, .priv_data_size = sizeof(KgvContext), diff --git a/libavcodec/kmvc.c b/libavcodec/kmvc.c index 1e37c233f4..153cea03b9 100644 --- a/libavcodec/kmvc.c +++ b/libavcodec/kmvc.c @@ -404,7 +404,7 @@ static av_cold int decode_init(AVCodecContext * avctx) const FFCodec ff_kmvc_decoder = { .p.name = "kmvc", - .p.long_name = NULL_IF_CONFIG_SMALL("Karl Morton's video codec"), + CODEC_LONG_NAME("Karl Morton's video codec"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_KMVC, .priv_data_size = sizeof(KmvcContext), diff --git a/libavcodec/lagarith.c b/libavcodec/lagarith.c index 68ffbc9821..78ccbc15b9 100644 --- a/libavcodec/lagarith.c +++ b/libavcodec/lagarith.c @@ -730,7 +730,7 @@ static av_cold int lag_decode_init(AVCodecContext *avctx) const FFCodec ff_lagarith_decoder = { .p.name = "lagarith", - .p.long_name = NULL_IF_CONFIG_SMALL("Lagarith lossless"), + CODEC_LONG_NAME("Lagarith lossless"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_LAGARITH, .priv_data_size = sizeof(LagarithContext), diff --git a/libavcodec/lcldec.c b/libavcodec/lcldec.c index 6de55450df..5cc0a29bcd 100644 --- a/libavcodec/lcldec.c +++ b/libavcodec/lcldec.c @@ -632,7 +632,7 @@ static av_cold int decode_end(AVCodecContext *avctx) #if CONFIG_MSZH_DECODER const FFCodec ff_mszh_decoder = { .p.name = "mszh", - .p.long_name = NULL_IF_CONFIG_SMALL("LCL (LossLess Codec Library) MSZH"), + CODEC_LONG_NAME("LCL (LossLess Codec Library) MSZH"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_MSZH, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS, @@ -647,7 +647,7 @@ const FFCodec ff_mszh_decoder = { #if CONFIG_ZLIB_DECODER const FFCodec ff_zlib_decoder = { .p.name = "zlib", - .p.long_name = NULL_IF_CONFIG_SMALL("LCL (LossLess Codec Library) ZLIB"), + CODEC_LONG_NAME("LCL (LossLess Codec Library) ZLIB"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_ZLIB, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS, diff --git a/libavcodec/lclenc.c b/libavcodec/lclenc.c index cbe336155e..2c9add5215 100644 --- a/libavcodec/lclenc.c +++ b/libavcodec/lclenc.c @@ -153,7 +153,7 @@ static av_cold int encode_end(AVCodecContext *avctx) const FFCodec ff_zlib_encoder = { .p.name = "zlib", - .p.long_name = NULL_IF_CONFIG_SMALL("LCL (LossLess Codec Library) ZLIB"), + CODEC_LONG_NAME("LCL (LossLess Codec Library) ZLIB"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_ZLIB, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS, diff --git a/libavcodec/libaomdec.c b/libavcodec/libaomdec.c index 5ed219b43d..378d638a89 100644 --- a/libavcodec/libaomdec.c +++ b/libavcodec/libaomdec.c @@ -227,7 +227,7 @@ static av_cold int av1_init(AVCodecContext *avctx) const FFCodec ff_libaom_av1_decoder = { .p.name = "libaom-av1", - .p.long_name = NULL_IF_CONFIG_SMALL("libaom AV1"), + CODEC_LONG_NAME("libaom AV1"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_AV1, .priv_data_size = sizeof(AV1DecodeContext), diff --git a/libavcodec/libaomenc.c b/libavcodec/libaomenc.c index 1e89b7e3a8..bd576fdd3a 100644 --- a/libavcodec/libaomenc.c +++ b/libavcodec/libaomenc.c @@ -1532,7 +1532,7 @@ static const AVClass class_aom = { FFCodec ff_libaom_av1_encoder = { .p.name = "libaom-av1", - .p.long_name = NULL_IF_CONFIG_SMALL("libaom AV1"), + CODEC_LONG_NAME("libaom AV1"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_AV1, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY | diff --git a/libavcodec/libaribb24.c b/libavcodec/libaribb24.c index e89e49a771..f40517e22e 100644 --- a/libavcodec/libaribb24.c +++ b/libavcodec/libaribb24.c @@ -383,7 +383,7 @@ static const AVClass aribb24_class = { const FFCodec ff_libaribb24_decoder = { .p.name = "libaribb24", - .p.long_name = NULL_IF_CONFIG_SMALL("libaribb24 ARIB STD-B24 caption decoder"), + CODEC_LONG_NAME("libaribb24 ARIB STD-B24 caption decoder"), .p.type = AVMEDIA_TYPE_SUBTITLE, .p.id = AV_CODEC_ID_ARIB_CAPTION, .p.priv_class = &aribb24_class, diff --git a/libavcodec/libcelt_dec.c b/libavcodec/libcelt_dec.c index 0c41a660bc..fcd4fc7736 100644 --- a/libavcodec/libcelt_dec.c +++ b/libavcodec/libcelt_dec.c @@ -129,7 +129,7 @@ static int libcelt_dec_decode(AVCodecContext *c, AVFrame *frame, const FFCodec ff_libcelt_decoder = { .p.name = "libcelt", - .p.long_name = NULL_IF_CONFIG_SMALL("Xiph CELT decoder using libcelt"), + CODEC_LONG_NAME("Xiph CELT decoder using libcelt"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_CELT, .p.capabilities = AV_CODEC_CAP_DR1, diff --git a/libavcodec/libcodec2.c b/libavcodec/libcodec2.c index 11e9d14d3a..be9677ddeb 100644 --- a/libavcodec/libcodec2.c +++ b/libavcodec/libcodec2.c @@ -178,7 +178,7 @@ static int libcodec2_encode(AVCodecContext *avctx, AVPacket *avpkt, const FFCodec ff_libcodec2_decoder = { .p.name = "libcodec2", - .p.long_name = NULL_IF_CONFIG_SMALL("codec2 decoder using libcodec2"), + CODEC_LONG_NAME("codec2 decoder using libcodec2"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_CODEC2, .p.capabilities = AV_CODEC_CAP_CHANNEL_CONF, @@ -197,7 +197,7 @@ const FFCodec ff_libcodec2_decoder = { const FFCodec ff_libcodec2_encoder = { .p.name = "libcodec2", - .p.long_name = NULL_IF_CONFIG_SMALL("codec2 encoder using libcodec2"), + CODEC_LONG_NAME("codec2 encoder using libcodec2"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_CODEC2, .p.capabilities = AV_CODEC_CAP_DR1, diff --git a/libavcodec/libdav1d.c b/libavcodec/libdav1d.c index b120d55190..e76f33d7e2 100644 --- a/libavcodec/libdav1d.c +++ b/libavcodec/libdav1d.c @@ -576,7 +576,7 @@ static const AVClass libdav1d_class = { const FFCodec ff_libdav1d_decoder = { .p.name = "libdav1d", - .p.long_name = NULL_IF_CONFIG_SMALL("dav1d AV1 decoder by VideoLAN"), + CODEC_LONG_NAME("dav1d AV1 decoder by VideoLAN"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_AV1, .priv_data_size = sizeof(Libdav1dContext), diff --git a/libavcodec/libdavs2.c b/libavcodec/libdavs2.c index ce4c6a34f0..179d2f4e4b 100644 --- a/libavcodec/libdavs2.c +++ b/libavcodec/libdavs2.c @@ -223,7 +223,7 @@ static int davs2_decode_frame(AVCodecContext *avctx, AVFrame *frame, const FFCodec ff_libdavs2_decoder = { .p.name = "libdavs2", - .p.long_name = NULL_IF_CONFIG_SMALL("libdavs2 AVS2-P2/IEEE1857.4"), + CODEC_LONG_NAME("libdavs2 AVS2-P2/IEEE1857.4"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_AVS2, .priv_data_size = sizeof(DAVS2Context), diff --git a/libavcodec/libfdk-aacdec.c b/libavcodec/libfdk-aacdec.c index c148d46208..8c1586e25e 100644 --- a/libavcodec/libfdk-aacdec.c +++ b/libavcodec/libfdk-aacdec.c @@ -478,7 +478,7 @@ static av_cold void fdk_aac_decode_flush(AVCodecContext *avctx) const FFCodec ff_libfdk_aac_decoder = { .p.name = "libfdk_aac", - .p.long_name = NULL_IF_CONFIG_SMALL("Fraunhofer FDK AAC"), + CODEC_LONG_NAME("Fraunhofer FDK AAC"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_AAC, .priv_data_size = sizeof(FDKAACDecContext), diff --git a/libavcodec/libfdk-aacenc.c b/libavcodec/libfdk-aacenc.c index f53f5e97a9..fc2e71c51f 100644 --- a/libavcodec/libfdk-aacenc.c +++ b/libavcodec/libfdk-aacenc.c @@ -477,7 +477,7 @@ static const int aac_sample_rates[] = { const FFCodec ff_libfdk_aac_encoder = { .p.name = "libfdk_aac", - .p.long_name = NULL_IF_CONFIG_SMALL("Fraunhofer FDK AAC"), + CODEC_LONG_NAME("Fraunhofer FDK AAC"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_AAC, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY | diff --git a/libavcodec/libgsmdec.c b/libavcodec/libgsmdec.c index ad0b3c2f2a..a86e9deac0 100644 --- a/libavcodec/libgsmdec.c +++ b/libavcodec/libgsmdec.c @@ -127,7 +127,7 @@ static void libgsm_flush(AVCodecContext *avctx) { #if CONFIG_LIBGSM_DECODER const FFCodec ff_libgsm_decoder = { .p.name = "libgsm", - .p.long_name = NULL_IF_CONFIG_SMALL("libgsm GSM"), + CODEC_LONG_NAME("libgsm GSM"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_GSM, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_CHANNEL_CONF, @@ -143,7 +143,7 @@ const FFCodec ff_libgsm_decoder = { #if CONFIG_LIBGSM_MS_DECODER const FFCodec ff_libgsm_ms_decoder = { .p.name = "libgsm_ms", - .p.long_name = NULL_IF_CONFIG_SMALL("libgsm GSM Microsoft variant"), + CODEC_LONG_NAME("libgsm GSM Microsoft variant"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_GSM_MS, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_CHANNEL_CONF, diff --git a/libavcodec/libgsmenc.c b/libavcodec/libgsmenc.c index f83389dd60..9ad430bf62 100644 --- a/libavcodec/libgsmenc.c +++ b/libavcodec/libgsmenc.c @@ -119,7 +119,7 @@ static const FFCodecDefault libgsm_defaults[] = { #if CONFIG_LIBGSM_ENCODER const FFCodec ff_libgsm_encoder = { .p.name = "libgsm", - .p.long_name = NULL_IF_CONFIG_SMALL("libgsm GSM"), + CODEC_LONG_NAME("libgsm GSM"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_GSM, .p.capabilities = AV_CODEC_CAP_DR1, @@ -140,7 +140,7 @@ const FFCodec ff_libgsm_encoder = { #if CONFIG_LIBGSM_MS_ENCODER const FFCodec ff_libgsm_ms_encoder = { .p.name = "libgsm_ms", - .p.long_name = NULL_IF_CONFIG_SMALL("libgsm GSM Microsoft variant"), + CODEC_LONG_NAME("libgsm GSM Microsoft variant"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_GSM_MS, .p.capabilities = AV_CODEC_CAP_DR1, diff --git a/libavcodec/libilbc.c b/libavcodec/libilbc.c index 485762f66c..9ef6e16bc5 100644 --- a/libavcodec/libilbc.c +++ b/libavcodec/libilbc.c @@ -119,7 +119,7 @@ static int ilbc_decode_frame(AVCodecContext *avctx, AVFrame *frame, const FFCodec ff_libilbc_decoder = { .p.name = "libilbc", - .p.long_name = NULL_IF_CONFIG_SMALL("iLBC (Internet Low Bitrate Codec)"), + CODEC_LONG_NAME("iLBC (Internet Low Bitrate Codec)"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_ILBC, .caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE, @@ -202,7 +202,7 @@ static const FFCodecDefault ilbc_encode_defaults[] = { const FFCodec ff_libilbc_encoder = { .p.name = "libilbc", - .p.long_name = NULL_IF_CONFIG_SMALL("iLBC (Internet Low Bitrate Codec)"), + CODEC_LONG_NAME("iLBC (Internet Low Bitrate Codec)"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_ILBC, .p.capabilities = AV_CODEC_CAP_DR1, diff --git a/libavcodec/libjxldec.c b/libavcodec/libjxldec.c index 0d59160d27..de48bea4b2 100644 --- a/libavcodec/libjxldec.c +++ b/libavcodec/libjxldec.c @@ -447,7 +447,7 @@ static av_cold int libjxl_decode_close(AVCodecContext *avctx) const FFCodec ff_libjxl_decoder = { .p.name = "libjxl", - .p.long_name = NULL_IF_CONFIG_SMALL("libjxl JPEG XL"), + CODEC_LONG_NAME("libjxl JPEG XL"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_JPEGXL, .priv_data_size = sizeof(LibJxlDecodeContext), diff --git a/libavcodec/libjxlenc.c b/libavcodec/libjxlenc.c index 7e97237cd1..0793ed251b 100644 --- a/libavcodec/libjxlenc.c +++ b/libavcodec/libjxlenc.c @@ -460,7 +460,7 @@ static const AVClass libjxl_encode_class = { const FFCodec ff_libjxl_encoder = { .p.name = "libjxl", - .p.long_name = NULL_IF_CONFIG_SMALL("libjxl JPEG XL"), + CODEC_LONG_NAME("libjxl JPEG XL"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_JPEGXL, .priv_data_size = sizeof(LibJxlEncodeContext), diff --git a/libavcodec/libkvazaar.c b/libavcodec/libkvazaar.c index 3a3648f23c..168486f4ec 100644 --- a/libavcodec/libkvazaar.c +++ b/libavcodec/libkvazaar.c @@ -320,7 +320,7 @@ static const FFCodecDefault defaults[] = { const FFCodec ff_libkvazaar_encoder = { .p.name = "libkvazaar", - .p.long_name = NULL_IF_CONFIG_SMALL("libkvazaar H.265 / HEVC"), + CODEC_LONG_NAME("libkvazaar H.265 / HEVC"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_HEVC, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY | diff --git a/libavcodec/libmp3lame.c b/libavcodec/libmp3lame.c index 2cd51692a2..c8a6eb8c33 100644 --- a/libavcodec/libmp3lame.c +++ b/libavcodec/libmp3lame.c @@ -330,7 +330,7 @@ static const int libmp3lame_sample_rates[] = { const FFCodec ff_libmp3lame_encoder = { .p.name = "libmp3lame", - .p.long_name = NULL_IF_CONFIG_SMALL("libmp3lame MP3 (MPEG audio layer 3)"), + CODEC_LONG_NAME("libmp3lame MP3 (MPEG audio layer 3)"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_MP3, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY | diff --git a/libavcodec/libopencore-amr.c b/libavcodec/libopencore-amr.c index 0d398ff02b..fd9e6e6343 100644 --- a/libavcodec/libopencore-amr.c +++ b/libavcodec/libopencore-amr.c @@ -135,7 +135,7 @@ static int amr_nb_decode_frame(AVCodecContext *avctx, AVFrame *frame, const FFCodec ff_libopencore_amrnb_decoder = { .p.name = "libopencore_amrnb", - .p.long_name = NULL_IF_CONFIG_SMALL("OpenCORE AMR-NB (Adaptive Multi-Rate Narrow-Band)"), + CODEC_LONG_NAME("OpenCORE AMR-NB (Adaptive Multi-Rate Narrow-Band)"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_AMR_NB, .caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE, @@ -291,7 +291,7 @@ static int amr_nb_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, const FFCodec ff_libopencore_amrnb_encoder = { .p.name = "libopencore_amrnb", - .p.long_name = NULL_IF_CONFIG_SMALL("OpenCORE AMR-NB (Adaptive Multi-Rate Narrow-Band)"), + CODEC_LONG_NAME("OpenCORE AMR-NB (Adaptive Multi-Rate Narrow-Band)"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_AMR_NB, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY | @@ -377,7 +377,7 @@ static int amr_wb_decode_close(AVCodecContext *avctx) const FFCodec ff_libopencore_amrwb_decoder = { .p.name = "libopencore_amrwb", - .p.long_name = NULL_IF_CONFIG_SMALL("OpenCORE AMR-WB (Adaptive Multi-Rate Wide-Band)"), + CODEC_LONG_NAME("OpenCORE AMR-WB (Adaptive Multi-Rate Wide-Band)"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_AMR_WB, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_CHANNEL_CONF, diff --git a/libavcodec/libopenh264dec.c b/libavcodec/libopenh264dec.c index 3a8be36bf6..af53219b41 100644 --- a/libavcodec/libopenh264dec.c +++ b/libavcodec/libopenh264dec.c @@ -158,7 +158,7 @@ static int svc_decode_frame(AVCodecContext *avctx, AVFrame *avframe, const FFCodec ff_libopenh264_decoder = { .p.name = "libopenh264", - .p.long_name = NULL_IF_CONFIG_SMALL("OpenH264 H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10"), + CODEC_LONG_NAME("OpenH264 H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_H264, .priv_data_size = sizeof(SVCContext), diff --git a/libavcodec/libopenh264enc.c b/libavcodec/libopenh264enc.c index 54dff6833d..bbd6969568 100644 --- a/libavcodec/libopenh264enc.c +++ b/libavcodec/libopenh264enc.c @@ -453,7 +453,7 @@ static const FFCodecDefault svc_enc_defaults[] = { const FFCodec ff_libopenh264_encoder = { .p.name = "libopenh264", - .p.long_name = NULL_IF_CONFIG_SMALL("OpenH264 H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10"), + CODEC_LONG_NAME("OpenH264 H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_H264, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_OTHER_THREADS, diff --git a/libavcodec/libopenjpegdec.c b/libavcodec/libopenjpegdec.c index be2337d9b2..206db07ec7 100644 --- a/libavcodec/libopenjpegdec.c +++ b/libavcodec/libopenjpegdec.c @@ -502,7 +502,7 @@ static const AVClass openjpeg_class = { const FFCodec ff_libopenjpeg_decoder = { .p.name = "libopenjpeg", - .p.long_name = NULL_IF_CONFIG_SMALL("OpenJPEG JPEG 2000"), + CODEC_LONG_NAME("OpenJPEG JPEG 2000"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_JPEG2000, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS, diff --git a/libavcodec/libopenjpegenc.c b/libavcodec/libopenjpegenc.c index 750fce3d8d..6f77780391 100644 --- a/libavcodec/libopenjpegenc.c +++ b/libavcodec/libopenjpegenc.c @@ -756,7 +756,7 @@ static const AVClass openjpeg_class = { const FFCodec ff_libopenjpeg_encoder = { .p.name = "libopenjpeg", - .p.long_name = NULL_IF_CONFIG_SMALL("OpenJPEG JPEG 2000"), + CODEC_LONG_NAME("OpenJPEG JPEG 2000"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_JPEG2000, .caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE, diff --git a/libavcodec/libopusdec.c b/libavcodec/libopusdec.c index fa7aba9d8a..31a04dfbeb 100644 --- a/libavcodec/libopusdec.c +++ b/libavcodec/libopusdec.c @@ -233,7 +233,7 @@ static const AVClass libopusdec_class = { const FFCodec ff_libopus_decoder = { .p.name = "libopus", - .p.long_name = NULL_IF_CONFIG_SMALL("libopus Opus"), + CODEC_LONG_NAME("libopus Opus"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_OPUS, .priv_data_size = sizeof(struct libopus_context), diff --git a/libavcodec/libopusenc.c b/libavcodec/libopusenc.c index dd4c5f3e8d..81e765403f 100644 --- a/libavcodec/libopusenc.c +++ b/libavcodec/libopusenc.c @@ -585,7 +585,7 @@ static const int libopus_sample_rates[] = { const FFCodec ff_libopus_encoder = { .p.name = "libopus", - .p.long_name = NULL_IF_CONFIG_SMALL("libopus Opus"), + CODEC_LONG_NAME("libopus Opus"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_OPUS, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY | diff --git a/libavcodec/librav1e.c b/libavcodec/librav1e.c index 67b301b802..0601efed2c 100644 --- a/libavcodec/librav1e.c +++ b/libavcodec/librav1e.c @@ -616,7 +616,7 @@ static const AVClass class = { const FFCodec ff_librav1e_encoder = { .p.name = "librav1e", - .p.long_name = NULL_IF_CONFIG_SMALL("librav1e AV1"), + CODEC_LONG_NAME("librav1e AV1"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_AV1, .init = librav1e_encode_init, diff --git a/libavcodec/librsvgdec.c b/libavcodec/librsvgdec.c index cfafae2652..9c8aa2dedc 100644 --- a/libavcodec/librsvgdec.c +++ b/libavcodec/librsvgdec.c @@ -120,7 +120,7 @@ static const AVClass librsvg_decoder_class = { const FFCodec ff_librsvg_decoder = { .p.name = "librsvg", - .p.long_name = NULL_IF_CONFIG_SMALL("Librsvg rasterizer"), + CODEC_LONG_NAME("Librsvg rasterizer"), .p.priv_class = &librsvg_decoder_class, .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_SVG, diff --git a/libavcodec/libshine.c b/libavcodec/libshine.c index 123b1a0847..621c57816a 100644 --- a/libavcodec/libshine.c +++ b/libavcodec/libshine.c @@ -133,7 +133,7 @@ static const int libshine_sample_rates[] = { const FFCodec ff_libshine_encoder = { .p.name = "libshine", - .p.long_name = NULL_IF_CONFIG_SMALL("libshine MP3 (MPEG audio layer 3)"), + CODEC_LONG_NAME("libshine MP3 (MPEG audio layer 3)"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_MP3, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY, diff --git a/libavcodec/libspeexdec.c b/libavcodec/libspeexdec.c index b1512549d6..47fc5d6a4b 100644 --- a/libavcodec/libspeexdec.c +++ b/libavcodec/libspeexdec.c @@ -192,7 +192,7 @@ static av_cold void libspeex_decode_flush(AVCodecContext *avctx) const FFCodec ff_libspeex_decoder = { .p.name = "libspeex", - .p.long_name = NULL_IF_CONFIG_SMALL("libspeex Speex"), + CODEC_LONG_NAME("libspeex Speex"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_SPEEX, .p.capabilities = AV_CODEC_CAP_SUBFRAMES | AV_CODEC_CAP_DELAY | AV_CODEC_CAP_DR1 | AV_CODEC_CAP_CHANNEL_CONF, diff --git a/libavcodec/libspeexenc.c b/libavcodec/libspeexenc.c index 411d9f0290..8d2c6347fa 100644 --- a/libavcodec/libspeexenc.c +++ b/libavcodec/libspeexenc.c @@ -350,7 +350,7 @@ static const FFCodecDefault defaults[] = { const FFCodec ff_libspeex_encoder = { .p.name = "libspeex", - .p.long_name = NULL_IF_CONFIG_SMALL("libspeex Speex"), + CODEC_LONG_NAME("libspeex Speex"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_SPEEX, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY, diff --git a/libavcodec/libsvtav1.c b/libavcodec/libsvtav1.c index 4c403a98d4..2f5634cee0 100644 --- a/libavcodec/libsvtav1.c +++ b/libavcodec/libsvtav1.c @@ -655,7 +655,7 @@ static const FFCodecDefault eb_enc_defaults[] = { const FFCodec ff_libsvtav1_encoder = { .p.name = "libsvtav1", - .p.long_name = NULL_IF_CONFIG_SMALL("SVT-AV1(Scalable Video Technology for AV1) encoder"), + CODEC_LONG_NAME("SVT-AV1(Scalable Video Technology for AV1) encoder"), .priv_data_size = sizeof(SvtContext), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_AV1, diff --git a/libavcodec/libtheoraenc.c b/libavcodec/libtheoraenc.c index 22835553d6..b453e74c81 100644 --- a/libavcodec/libtheoraenc.c +++ b/libavcodec/libtheoraenc.c @@ -369,7 +369,7 @@ static av_cold int encode_close(AVCodecContext* avc_context) /** AVCodec struct exposed to libavcodec */ const FFCodec ff_libtheora_encoder = { .p.name = "libtheora", - .p.long_name = NULL_IF_CONFIG_SMALL("libtheora Theora"), + CODEC_LONG_NAME("libtheora Theora"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_THEORA, .p.capabilities = AV_CODEC_CAP_DR1 | diff --git a/libavcodec/libtwolame.c b/libavcodec/libtwolame.c index 3da57bb779..2168b3cdf6 100644 --- a/libavcodec/libtwolame.c +++ b/libavcodec/libtwolame.c @@ -210,7 +210,7 @@ static const int twolame_samplerates[] = { const FFCodec ff_libtwolame_encoder = { .p.name = "libtwolame", - .p.long_name = NULL_IF_CONFIG_SMALL("libtwolame MP2 (MPEG audio layer 2)"), + CODEC_LONG_NAME("libtwolame MP2 (MPEG audio layer 2)"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_MP2, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY, diff --git a/libavcodec/libuavs3d.c b/libavcodec/libuavs3d.c index 95616fcacb..f5a6e59496 100644 --- a/libavcodec/libuavs3d.c +++ b/libavcodec/libuavs3d.c @@ -248,7 +248,7 @@ static int libuavs3d_decode_frame(AVCodecContext *avctx, AVFrame *frm, const FFCodec ff_libuavs3d_decoder = { .p.name = "libuavs3d", - .p.long_name = NULL_IF_CONFIG_SMALL("libuavs3d AVS3-P2/IEEE1857.10"), + CODEC_LONG_NAME("libuavs3d AVS3-P2/IEEE1857.10"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_AVS3, .priv_data_size = sizeof(uavs3d_context), diff --git a/libavcodec/libvo-amrwbenc.c b/libavcodec/libvo-amrwbenc.c index a2d7f33ef7..76a6b69994 100644 --- a/libavcodec/libvo-amrwbenc.c +++ b/libavcodec/libvo-amrwbenc.c @@ -141,8 +141,7 @@ static int amr_wb_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, const FFCodec ff_libvo_amrwbenc_encoder = { .p.name = "libvo_amrwbenc", - .p.long_name = NULL_IF_CONFIG_SMALL("Android VisualOn AMR-WB " - "(Adaptive Multi-Rate Wide-Band)"), + CODEC_LONG_NAME("Android VisualOn AMR-WB (Adaptive Multi-Rate Wide-Band)"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_AMR_WB, .p.capabilities = AV_CODEC_CAP_DR1, diff --git a/libavcodec/libvorbisdec.c b/libavcodec/libvorbisdec.c index f0f16f27cf..a5e7a691d6 100644 --- a/libavcodec/libvorbisdec.c +++ b/libavcodec/libvorbisdec.c @@ -212,7 +212,7 @@ static int oggvorbis_decode_close(AVCodecContext *avccontext) { const FFCodec ff_libvorbis_decoder = { .p.name = "libvorbis", - .p.long_name = NULL_IF_CONFIG_SMALL("libvorbis"), + CODEC_LONG_NAME("libvorbis"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_VORBIS, .p.capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_CHANNEL_CONF, diff --git a/libavcodec/libvorbisenc.c b/libavcodec/libvorbisenc.c index 718e9d1912..f78a88bbcd 100644 --- a/libavcodec/libvorbisenc.c +++ b/libavcodec/libvorbisenc.c @@ -376,7 +376,7 @@ static int libvorbis_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, const FFCodec ff_libvorbis_encoder = { .p.name = "libvorbis", - .p.long_name = NULL_IF_CONFIG_SMALL("libvorbis"), + CODEC_LONG_NAME("libvorbis"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_VORBIS, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY | diff --git a/libavcodec/libvpxdec.c b/libavcodec/libvpxdec.c index c7cb744312..9cd2c56caf 100644 --- a/libavcodec/libvpxdec.c +++ b/libavcodec/libvpxdec.c @@ -356,7 +356,7 @@ static av_cold int vp8_init(AVCodecContext *avctx) const FFCodec ff_libvpx_vp8_decoder = { .p.name = "libvpx", - .p.long_name = NULL_IF_CONFIG_SMALL("libvpx VP8"), + CODEC_LONG_NAME("libvpx VP8"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_VP8, .p.capabilities = AV_CODEC_CAP_OTHER_THREADS | AV_CODEC_CAP_DR1, @@ -379,7 +379,7 @@ static av_cold int vp9_init(AVCodecContext *avctx) FFCodec ff_libvpx_vp9_decoder = { .p.name = "libvpx-vp9", - .p.long_name = NULL_IF_CONFIG_SMALL("libvpx VP9"), + CODEC_LONG_NAME("libvpx VP9"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_VP9, .p.capabilities = AV_CODEC_CAP_OTHER_THREADS, diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c index bbbe56c0dc..09b56aae2a 100644 --- a/libavcodec/libvpxenc.c +++ b/libavcodec/libvpxenc.c @@ -1944,7 +1944,7 @@ static const AVClass class_vp8 = { const FFCodec ff_libvpx_vp8_encoder = { .p.name = "libvpx", - .p.long_name = NULL_IF_CONFIG_SMALL("libvpx VP8"), + CODEC_LONG_NAME("libvpx VP8"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_VP8, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY | @@ -1977,7 +1977,7 @@ static const AVClass class_vp9 = { FFCodec ff_libvpx_vp9_encoder = { .p.name = "libvpx-vp9", - .p.long_name = NULL_IF_CONFIG_SMALL("libvpx VP9"), + CODEC_LONG_NAME("libvpx VP9"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_VP9, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY | diff --git a/libavcodec/libwebpenc.c b/libavcodec/libwebpenc.c index be7bfa3963..ee5795f041 100644 --- a/libavcodec/libwebpenc.c +++ b/libavcodec/libwebpenc.c @@ -89,7 +89,7 @@ static int libwebp_encode_close(AVCodecContext *avctx) const FFCodec ff_libwebp_encoder = { .p.name = "libwebp", - .p.long_name = NULL_IF_CONFIG_SMALL("libwebp WebP image"), + CODEC_LONG_NAME("libwebp WebP image"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_WEBP, .p.capabilities = AV_CODEC_CAP_DR1, diff --git a/libavcodec/libwebpenc_animencoder.c b/libavcodec/libwebpenc_animencoder.c index 43116c63c0..0f2c190c8c 100644 --- a/libavcodec/libwebpenc_animencoder.c +++ b/libavcodec/libwebpenc_animencoder.c @@ -131,7 +131,7 @@ static int libwebp_anim_encode_close(AVCodecContext *avctx) const FFCodec ff_libwebp_anim_encoder = { .p.name = "libwebp_anim", - .p.long_name = NULL_IF_CONFIG_SMALL("libwebp WebP image"), + CODEC_LONG_NAME("libwebp WebP image"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_WEBP, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY, diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index 6afa3cdadb..ca0b5a145b 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -1270,7 +1270,7 @@ const #endif FFCodec ff_libx264_encoder = { .p.name = "libx264", - .p.long_name = NULL_IF_CONFIG_SMALL("libx264 H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10"), + CODEC_LONG_NAME("libx264 H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_H264, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY | @@ -1307,7 +1307,7 @@ static const AVClass rgbclass = { const FFCodec ff_libx264rgb_encoder = { .p.name = "libx264rgb", - .p.long_name = NULL_IF_CONFIG_SMALL("libx264 H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10 RGB"), + CODEC_LONG_NAME("libx264 H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10 RGB"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_H264, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY | @@ -1339,7 +1339,7 @@ static const AVClass X262_class = { const FFCodec ff_libx262_encoder = { .p.name = "libx262", - .p.long_name = NULL_IF_CONFIG_SMALL("libx262 MPEG2VIDEO"), + CODEC_LONG_NAME("libx262 MPEG2VIDEO"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_MPEG2VIDEO, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY | diff --git a/libavcodec/libx265.c b/libavcodec/libx265.c index 6d2590dd7f..4aa96e1f2d 100644 --- a/libavcodec/libx265.c +++ b/libavcodec/libx265.c @@ -743,7 +743,7 @@ static const FFCodecDefault x265_defaults[] = { FFCodec ff_libx265_encoder = { .p.name = "libx265", - .p.long_name = NULL_IF_CONFIG_SMALL("libx265 H.265 / HEVC"), + CODEC_LONG_NAME("libx265 H.265 / HEVC"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_HEVC, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY | diff --git a/libavcodec/libxavs.c b/libavcodec/libxavs.c index 2c7577535f..9ed73d1042 100644 --- a/libavcodec/libxavs.c +++ b/libavcodec/libxavs.c @@ -423,7 +423,7 @@ static const FFCodecDefault xavs_defaults[] = { const FFCodec ff_libxavs_encoder = { .p.name = "libxavs", - .p.long_name = NULL_IF_CONFIG_SMALL("libxavs Chinese AVS (Audio Video Standard)"), + CODEC_LONG_NAME("libxavs Chinese AVS (Audio Video Standard)"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_CAVS, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY | diff --git a/libavcodec/libxavs2.c b/libavcodec/libxavs2.c index d4a1bf5bfc..1672edfc07 100644 --- a/libavcodec/libxavs2.c +++ b/libavcodec/libxavs2.c @@ -288,7 +288,7 @@ static const FFCodecDefault xavs2_defaults[] = { const FFCodec ff_libxavs2_encoder = { .p.name = "libxavs2", - .p.long_name = NULL_IF_CONFIG_SMALL("libxavs2 AVS2-P2/IEEE1857.4"), + CODEC_LONG_NAME("libxavs2 AVS2-P2/IEEE1857.4"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_AVS2, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY | diff --git a/libavcodec/libxvid.c b/libavcodec/libxvid.c index 3845905555..4e04b3c098 100644 --- a/libavcodec/libxvid.c +++ b/libavcodec/libxvid.c @@ -899,7 +899,7 @@ static const AVClass xvid_class = { const FFCodec ff_libxvid_encoder = { .p.name = "libxvid", - .p.long_name = NULL_IF_CONFIG_SMALL("libxvidcore MPEG-4 part 2"), + CODEC_LONG_NAME("libxvidcore MPEG-4 part 2"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_MPEG4, .p.capabilities = AV_CODEC_CAP_DR1, diff --git a/libavcodec/libzvbi-teletextdec.c b/libavcodec/libzvbi-teletextdec.c index c88ede05b5..45e30eb01c 100644 --- a/libavcodec/libzvbi-teletextdec.c +++ b/libavcodec/libzvbi-teletextdec.c @@ -813,7 +813,7 @@ static const AVClass teletext_class = { const FFCodec ff_libzvbi_teletext_decoder = { .p.name = "libzvbi_teletextdec", - .p.long_name = NULL_IF_CONFIG_SMALL("Libzvbi DVB teletext decoder"), + CODEC_LONG_NAME("Libzvbi DVB teletext decoder"), .p.type = AVMEDIA_TYPE_SUBTITLE, .p.id = AV_CODEC_ID_DVB_TELETEXT, .p.capabilities = AV_CODEC_CAP_DELAY, diff --git a/libavcodec/ljpegenc.c b/libavcodec/ljpegenc.c index 7aab915d01..a708d71220 100644 --- a/libavcodec/ljpegenc.c +++ b/libavcodec/ljpegenc.c @@ -325,7 +325,7 @@ static const AVClass ljpeg_class = { const FFCodec ff_ljpeg_encoder = { .p.name = "ljpeg", - .p.long_name = NULL_IF_CONFIG_SMALL("Lossless JPEG"), + CODEC_LONG_NAME("Lossless JPEG"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_LJPEG, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS, diff --git a/libavcodec/loco.c b/libavcodec/loco.c index a31bbf38c1..d57a67317a 100644 --- a/libavcodec/loco.c +++ b/libavcodec/loco.c @@ -338,7 +338,7 @@ static av_cold int decode_init(AVCodecContext *avctx) const FFCodec ff_loco_decoder = { .p.name = "loco", - .p.long_name = NULL_IF_CONFIG_SMALL("LOCO"), + CODEC_LONG_NAME("LOCO"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_LOCO, .priv_data_size = sizeof(LOCOContext), diff --git a/libavcodec/lscrdec.c b/libavcodec/lscrdec.c index cd7dc8b2b7..76a46751f0 100644 --- a/libavcodec/lscrdec.c +++ b/libavcodec/lscrdec.c @@ -246,7 +246,7 @@ static void lscr_decode_flush(AVCodecContext *avctx) const FFCodec ff_lscr_decoder = { .p.name = "lscr", - .p.long_name = NULL_IF_CONFIG_SMALL("LEAD Screen Capture"), + CODEC_LONG_NAME("LEAD Screen Capture"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_LSCR, .p.capabilities = AV_CODEC_CAP_DR1, diff --git a/libavcodec/m101.c b/libavcodec/m101.c index 5a06f02c37..3def577b74 100644 --- a/libavcodec/m101.c +++ b/libavcodec/m101.c @@ -106,7 +106,7 @@ static int m101_decode_frame(AVCodecContext *avctx, AVFrame *frame, const FFCodec ff_m101_decoder = { .p.name = "m101", - .p.long_name = NULL_IF_CONFIG_SMALL("Matrox Uncompressed SD"), + CODEC_LONG_NAME("Matrox Uncompressed SD"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_M101, .init = m101_decode_init, diff --git a/libavcodec/mace.c b/libavcodec/mace.c index bf45b36a20..a35291330e 100644 --- a/libavcodec/mace.c +++ b/libavcodec/mace.c @@ -286,7 +286,7 @@ static int mace_decode_frame(AVCodecContext *avctx, AVFrame *frame, const FFCodec ff_mace3_decoder = { .p.name = "mace3", - .p.long_name = NULL_IF_CONFIG_SMALL("MACE (Macintosh Audio Compression/Expansion) 3:1"), + CODEC_LONG_NAME("MACE (Macintosh Audio Compression/Expansion) 3:1"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_MACE3, .priv_data_size = sizeof(MACEContext), @@ -299,7 +299,7 @@ const FFCodec ff_mace3_decoder = { const FFCodec ff_mace6_decoder = { .p.name = "mace6", - .p.long_name = NULL_IF_CONFIG_SMALL("MACE (Macintosh Audio Compression/Expansion) 6:1"), + CODEC_LONG_NAME("MACE (Macintosh Audio Compression/Expansion) 6:1"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_MACE6, .priv_data_size = sizeof(MACEContext), diff --git a/libavcodec/magicyuv.c b/libavcodec/magicyuv.c index 8b30ce08ac..62263409b1 100644 --- a/libavcodec/magicyuv.c +++ b/libavcodec/magicyuv.c @@ -694,7 +694,7 @@ static av_cold int magy_decode_end(AVCodecContext *avctx) const FFCodec ff_magicyuv_decoder = { .p.name = "magicyuv", - .p.long_name = NULL_IF_CONFIG_SMALL("MagicYUV video"), + CODEC_LONG_NAME("MagicYUV video"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_MAGICYUV, .priv_data_size = sizeof(MagicYUVContext), diff --git a/libavcodec/magicyuvenc.c b/libavcodec/magicyuvenc.c index b2846948e6..7f9ff72834 100644 --- a/libavcodec/magicyuvenc.c +++ b/libavcodec/magicyuvenc.c @@ -566,7 +566,7 @@ static const AVClass magicyuv_class = { const FFCodec ff_magicyuv_encoder = { .p.name = "magicyuv", - .p.long_name = NULL_IF_CONFIG_SMALL("MagicYUV video"), + CODEC_LONG_NAME("MagicYUV video"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_MAGICYUV, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS, diff --git a/libavcodec/mdec.c b/libavcodec/mdec.c index 59bf86b0d7..c8994f68ee 100644 --- a/libavcodec/mdec.c +++ b/libavcodec/mdec.c @@ -251,7 +251,7 @@ static av_cold int decode_end(AVCodecContext *avctx) const FFCodec ff_mdec_decoder = { .p.name = "mdec", - .p.long_name = NULL_IF_CONFIG_SMALL("Sony PlayStation MDEC (Motion DECoder)"), + CODEC_LONG_NAME("Sony PlayStation MDEC (Motion DECoder)"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_MDEC, .priv_data_size = sizeof(MDECContext), diff --git a/libavcodec/mediacodecdec.c b/libavcodec/mediacodecdec.c index 0bf2a0595d..322b448d27 100644 --- a/libavcodec/mediacodecdec.c +++ b/libavcodec/mediacodecdec.c @@ -534,7 +534,7 @@ static const AVClass ff_##short_name##_mediacodec_dec_class = { \ DECLARE_MEDIACODEC_VCLASS(short_name) \ const FFCodec ff_ ## short_name ## _mediacodec_decoder = { \ .p.name = #short_name "_mediacodec", \ - .p.long_name = NULL_IF_CONFIG_SMALL(full_name " Android MediaCodec decoder"), \ + CODEC_LONG_NAME(full_name " Android MediaCodec decoder"), \ .p.type = AVMEDIA_TYPE_VIDEO, \ .p.id = codec_id, \ .p.priv_class = &ff_##short_name##_mediacodec_dec_class, \ diff --git a/libavcodec/metasound.c b/libavcodec/metasound.c index 6597563c67..d5bf2d22ad 100644 --- a/libavcodec/metasound.c +++ b/libavcodec/metasound.c @@ -375,7 +375,7 @@ static av_cold int metasound_decode_init(AVCodecContext *avctx) const FFCodec ff_metasound_decoder = { .p.name = "metasound", - .p.long_name = NULL_IF_CONFIG_SMALL("Voxware MetaSound"), + CODEC_LONG_NAME("Voxware MetaSound"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_METASOUND, .priv_data_size = sizeof(TwinVQContext), diff --git a/libavcodec/mfenc.c b/libavcodec/mfenc.c index d5c241d169..36a6d8482d 100644 --- a/libavcodec/mfenc.c +++ b/libavcodec/mfenc.c @@ -1230,7 +1230,7 @@ static int mf_init(AVCodecContext *avctx) const FFCodec ff_ ## NAME ## _mf_encoder = { \ .p.priv_class = &ff_ ## NAME ## _mf_encoder_class, \ .p.name = #NAME "_mf", \ - .p.long_name = NULL_IF_CONFIG_SMALL(#ID " via MediaFoundation"), \ + CODEC_LONG_NAME(#ID " via MediaFoundation"), \ .p.type = AVMEDIA_TYPE_ ## MEDIATYPE, \ .p.id = AV_CODEC_ID_ ## ID, \ .priv_data_size = sizeof(MFContext), \ diff --git a/libavcodec/microdvddec.c b/libavcodec/microdvddec.c index b675fc0ea7..786a3845fd 100644 --- a/libavcodec/microdvddec.c +++ b/libavcodec/microdvddec.c @@ -370,7 +370,7 @@ static int microdvd_init(AVCodecContext *avctx) const FFCodec ff_microdvd_decoder = { .p.name = "microdvd", - .p.long_name = NULL_IF_CONFIG_SMALL("MicroDVD subtitle"), + CODEC_LONG_NAME("MicroDVD subtitle"), .p.type = AVMEDIA_TYPE_SUBTITLE, .p.id = AV_CODEC_ID_MICRODVD, .init = microdvd_init, diff --git a/libavcodec/midivid.c b/libavcodec/midivid.c index eaf138e87e..599d5c8f8f 100644 --- a/libavcodec/midivid.c +++ b/libavcodec/midivid.c @@ -274,7 +274,7 @@ static av_cold int decode_close(AVCodecContext *avctx) const FFCodec ff_mvdv_decoder = { .p.name = "mvdv", - .p.long_name = NULL_IF_CONFIG_SMALL("MidiVid VQ"), + CODEC_LONG_NAME("MidiVid VQ"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_MVDV, .priv_data_size = sizeof(MidiVidContext), diff --git a/libavcodec/mimic.c b/libavcodec/mimic.c index f5164e82e7..c506a42322 100644 --- a/libavcodec/mimic.c +++ b/libavcodec/mimic.c @@ -438,7 +438,7 @@ static int mimic_decode_frame(AVCodecContext *avctx, AVFrame *rframe, const FFCodec ff_mimic_decoder = { .p.name = "mimic", - .p.long_name = NULL_IF_CONFIG_SMALL("Mimic"), + CODEC_LONG_NAME("Mimic"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_MIMIC, .priv_data_size = sizeof(MimicContext), diff --git a/libavcodec/mjpegbdec.c b/libavcodec/mjpegbdec.c index 2778332e2e..e74addb24b 100644 --- a/libavcodec/mjpegbdec.c +++ b/libavcodec/mjpegbdec.c @@ -158,7 +158,7 @@ read_header: const FFCodec ff_mjpegb_decoder = { .p.name = "mjpegb", - .p.long_name = NULL_IF_CONFIG_SMALL("Apple MJPEG-B"), + CODEC_LONG_NAME("Apple MJPEG-B"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_MJPEGB, .priv_data_size = sizeof(MJpegDecodeContext), diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 65c3c402a2..65337360b0 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -3020,7 +3020,7 @@ static const AVClass mjpegdec_class = { const FFCodec ff_mjpeg_decoder = { .p.name = "mjpeg", - .p.long_name = NULL_IF_CONFIG_SMALL("MJPEG (Motion JPEG)"), + CODEC_LONG_NAME("MJPEG (Motion JPEG)"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_MJPEG, .priv_data_size = sizeof(MJpegDecodeContext), @@ -3050,7 +3050,7 @@ const FFCodec ff_mjpeg_decoder = { #if CONFIG_THP_DECODER const FFCodec ff_thp_decoder = { .p.name = "thp", - .p.long_name = NULL_IF_CONFIG_SMALL("Nintendo Gamecube THP video"), + CODEC_LONG_NAME("Nintendo Gamecube THP video"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_THP, .priv_data_size = sizeof(MJpegDecodeContext), @@ -3068,7 +3068,7 @@ const FFCodec ff_thp_decoder = { #if CONFIG_SMVJPEG_DECODER const FFCodec ff_smvjpeg_decoder = { .p.name = "smvjpeg", - .p.long_name = NULL_IF_CONFIG_SMALL("SMV JPEG"), + CODEC_LONG_NAME("SMV JPEG"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_SMVJPEG, .priv_data_size = sizeof(MJpegDecodeContext), diff --git a/libavcodec/mjpegenc.c b/libavcodec/mjpegenc.c index 3df0b51bb4..e56a466b36 100644 --- a/libavcodec/mjpegenc.c +++ b/libavcodec/mjpegenc.c @@ -644,7 +644,7 @@ static const AVClass mjpeg_class = { const FFCodec ff_mjpeg_encoder = { .p.name = "mjpeg", - .p.long_name = NULL_IF_CONFIG_SMALL("MJPEG (Motion JPEG)"), + CODEC_LONG_NAME("MJPEG (Motion JPEG)"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_MJPEG, .priv_data_size = sizeof(MJPEGEncContext), @@ -673,7 +673,7 @@ static const AVClass amv_class = { const FFCodec ff_amv_encoder = { .p.name = "amv", - .p.long_name = NULL_IF_CONFIG_SMALL("AMV Video"), + CODEC_LONG_NAME("AMV Video"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_AMV, .priv_data_size = sizeof(MJPEGEncContext), diff --git a/libavcodec/mlpdec.c b/libavcodec/mlpdec.c index bfd0091323..0a97fae26c 100644 --- a/libavcodec/mlpdec.c +++ b/libavcodec/mlpdec.c @@ -1416,7 +1416,7 @@ static const AVClass truehd_decoder_class = { #if CONFIG_MLP_DECODER const FFCodec ff_mlp_decoder = { .p.name = "mlp", - .p.long_name = NULL_IF_CONFIG_SMALL("MLP (Meridian Lossless Packing)"), + CODEC_LONG_NAME("MLP (Meridian Lossless Packing)"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_MLP, .priv_data_size = sizeof(MLPDecodeContext), @@ -1430,7 +1430,7 @@ const FFCodec ff_mlp_decoder = { #if CONFIG_TRUEHD_DECODER const FFCodec ff_truehd_decoder = { .p.name = "truehd", - .p.long_name = NULL_IF_CONFIG_SMALL("TrueHD"), + CODEC_LONG_NAME("TrueHD"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_TRUEHD, .priv_data_size = sizeof(MLPDecodeContext), diff --git a/libavcodec/mlpenc.c b/libavcodec/mlpenc.c index c986a0395f..80dc03a0ca 100644 --- a/libavcodec/mlpenc.c +++ b/libavcodec/mlpenc.c @@ -2210,7 +2210,7 @@ static av_cold int mlp_encode_close(AVCodecContext *avctx) #if CONFIG_MLP_ENCODER const FFCodec ff_mlp_encoder = { .p.name ="mlp", - .p.long_name = NULL_IF_CONFIG_SMALL("MLP (Meridian Lossless Packing)"), + CODEC_LONG_NAME("MLP (Meridian Lossless Packing)"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_MLP, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY | @@ -2231,7 +2231,7 @@ const FFCodec ff_mlp_encoder = { #if CONFIG_TRUEHD_ENCODER const FFCodec ff_truehd_encoder = { .p.name ="truehd", - .p.long_name = NULL_IF_CONFIG_SMALL("TrueHD"), + CODEC_LONG_NAME("TrueHD"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_TRUEHD, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY | diff --git a/libavcodec/mmaldec.c b/libavcodec/mmaldec.c index c9b7b16b69..3092f58510 100644 --- a/libavcodec/mmaldec.c +++ b/libavcodec/mmaldec.c @@ -831,7 +831,7 @@ static const AVClass ffmmal_dec_class = { #define FFMMAL_DEC(NAME, ID) \ const FFCodec ff_##NAME##_mmal_decoder = { \ .p.name = #NAME "_mmal", \ - .p.long_name = NULL_IF_CONFIG_SMALL(#NAME " (mmal)"), \ + CODEC_LONG_NAME(#NAME " (mmal)"), \ .p.type = AVMEDIA_TYPE_VIDEO, \ .p.id = ID, \ .priv_data_size = sizeof(MMALDecodeContext), \ diff --git a/libavcodec/mmvideo.c b/libavcodec/mmvideo.c index 97e55119e4..3038d9ea92 100644 --- a/libavcodec/mmvideo.c +++ b/libavcodec/mmvideo.c @@ -240,7 +240,7 @@ static av_cold int mm_decode_end(AVCodecContext *avctx) const FFCodec ff_mmvideo_decoder = { .p.name = "mmvideo", - .p.long_name = NULL_IF_CONFIG_SMALL("American Laser Games MM Video"), + CODEC_LONG_NAME("American Laser Games MM Video"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_MMVIDEO, .priv_data_size = sizeof(MmContext), diff --git a/libavcodec/mobiclip.c b/libavcodec/mobiclip.c index b99b070c56..5348f3bd6c 100644 --- a/libavcodec/mobiclip.c +++ b/libavcodec/mobiclip.c @@ -1342,7 +1342,7 @@ static av_cold int mobiclip_close(AVCodecContext *avctx) const FFCodec ff_mobiclip_decoder = { .p.name = "mobiclip", - .p.long_name = NULL_IF_CONFIG_SMALL("MobiClip Video"), + CODEC_LONG_NAME("MobiClip Video"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_MOBICLIP, .priv_data_size = sizeof(MobiClipContext), diff --git a/libavcodec/motionpixels.c b/libavcodec/motionpixels.c index 51e22c04c8..4141c5a495 100644 --- a/libavcodec/motionpixels.c +++ b/libavcodec/motionpixels.c @@ -347,7 +347,7 @@ end: const FFCodec ff_motionpixels_decoder = { .p.name = "motionpixels", - .p.long_name = NULL_IF_CONFIG_SMALL("Motion Pixels video"), + CODEC_LONG_NAME("Motion Pixels video"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_MOTIONPIXELS, .priv_data_size = sizeof(MotionPixelsContext), diff --git a/libavcodec/movtextdec.c b/libavcodec/movtextdec.c index 42a964951d..f799252bf2 100644 --- a/libavcodec/movtextdec.c +++ b/libavcodec/movtextdec.c @@ -593,7 +593,7 @@ static const AVClass mov_text_decoder_class = { const FFCodec ff_movtext_decoder = { .p.name = "mov_text", - .p.long_name = NULL_IF_CONFIG_SMALL("3GPP Timed Text subtitle"), + CODEC_LONG_NAME("3GPP Timed Text subtitle"), .p.type = AVMEDIA_TYPE_SUBTITLE, .p.id = AV_CODEC_ID_MOV_TEXT, .priv_data_size = sizeof(MovTextContext), diff --git a/libavcodec/movtextenc.c b/libavcodec/movtextenc.c index 9c17ca855a..7aa74d7c9d 100644 --- a/libavcodec/movtextenc.c +++ b/libavcodec/movtextenc.c @@ -701,7 +701,7 @@ static const AVClass mov_text_encoder_class = { const FFCodec ff_movtext_encoder = { .p.name = "mov_text", - .p.long_name = NULL_IF_CONFIG_SMALL("3GPP Timed Text subtitle"), + CODEC_LONG_NAME("3GPP Timed Text subtitle"), .p.type = AVMEDIA_TYPE_SUBTITLE, .p.id = AV_CODEC_ID_MOV_TEXT, .priv_data_size = sizeof(MovTextContext), diff --git a/libavcodec/mpc7.c b/libavcodec/mpc7.c index 0f203033ef..d2745366c2 100644 --- a/libavcodec/mpc7.c +++ b/libavcodec/mpc7.c @@ -311,7 +311,7 @@ static av_cold int mpc7_decode_close(AVCodecContext *avctx) const FFCodec ff_mpc7_decoder = { .p.name = "mpc7", - .p.long_name = NULL_IF_CONFIG_SMALL("Musepack SV7"), + CODEC_LONG_NAME("Musepack SV7"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_MUSEPACK7, .priv_data_size = sizeof(MPCContext), diff --git a/libavcodec/mpc8.c b/libavcodec/mpc8.c index 4ffdb32483..c1b787c33f 100644 --- a/libavcodec/mpc8.c +++ b/libavcodec/mpc8.c @@ -385,7 +385,7 @@ static av_cold void mpc8_decode_flush(AVCodecContext *avctx) const FFCodec ff_mpc8_decoder = { .p.name = "mpc8", - .p.long_name = NULL_IF_CONFIG_SMALL("Musepack SV8"), + CODEC_LONG_NAME("Musepack SV8"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_MUSEPACK8, .priv_data_size = sizeof(MPCContext), diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index 34e9ed3505..2aa5bc776d 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -2865,7 +2865,7 @@ static av_cold int mpeg_decode_end(AVCodecContext *avctx) const FFCodec ff_mpeg1video_decoder = { .p.name = "mpeg1video", - .p.long_name = NULL_IF_CONFIG_SMALL("MPEG-1 video"), + CODEC_LONG_NAME("MPEG-1 video"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_MPEG1VIDEO, .priv_data_size = sizeof(Mpeg1Context), @@ -2897,7 +2897,7 @@ const FFCodec ff_mpeg1video_decoder = { const FFCodec ff_mpeg2video_decoder = { .p.name = "mpeg2video", - .p.long_name = NULL_IF_CONFIG_SMALL("MPEG-2 video"), + CODEC_LONG_NAME("MPEG-2 video"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_MPEG2VIDEO, .priv_data_size = sizeof(Mpeg1Context), @@ -2942,7 +2942,7 @@ const FFCodec ff_mpeg2video_decoder = { //legacy decoder const FFCodec ff_mpegvideo_decoder = { .p.name = "mpegvideo", - .p.long_name = NULL_IF_CONFIG_SMALL("MPEG-1 video"), + CODEC_LONG_NAME("MPEG-1 video"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_MPEG2VIDEO, .priv_data_size = sizeof(Mpeg1Context), @@ -3106,7 +3106,7 @@ static av_cold int ipu_decode_end(AVCodecContext *avctx) const FFCodec ff_ipu_decoder = { .p.name = "ipu", - .p.long_name = NULL_IF_CONFIG_SMALL("IPU Video"), + CODEC_LONG_NAME("IPU Video"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_IPU, .priv_data_size = sizeof(IPUContext), diff --git a/libavcodec/mpeg12enc.c b/libavcodec/mpeg12enc.c index a7e7aef010..e1f09b7ede 100644 --- a/libavcodec/mpeg12enc.c +++ b/libavcodec/mpeg12enc.c @@ -1220,7 +1220,7 @@ mpeg12_class(2) const FFCodec ff_mpeg1video_encoder = { .p.name = "mpeg1video", - .p.long_name = NULL_IF_CONFIG_SMALL("MPEG-1 video"), + CODEC_LONG_NAME("MPEG-1 video"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_MPEG1VIDEO, .priv_data_size = sizeof(MPEG12EncContext), @@ -1237,7 +1237,7 @@ const FFCodec ff_mpeg1video_encoder = { const FFCodec ff_mpeg2video_encoder = { .p.name = "mpeg2video", - .p.long_name = NULL_IF_CONFIG_SMALL("MPEG-2 video"), + CODEC_LONG_NAME("MPEG-2 video"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_MPEG2VIDEO, .priv_data_size = sizeof(MPEG12EncContext), diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index 65f3c89c47..8eb81688ef 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -3668,7 +3668,7 @@ static const AVClass mpeg4_class = { const FFCodec ff_mpeg4_decoder = { .p.name = "mpeg4", - .p.long_name = NULL_IF_CONFIG_SMALL("MPEG-4 part 2"), + CODEC_LONG_NAME("MPEG-4 part 2"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_MPEG4, .priv_data_size = sizeof(Mpeg4DecContext), diff --git a/libavcodec/mpeg4videoenc.c b/libavcodec/mpeg4videoenc.c index 96c48b2eb2..8e6e35b927 100644 --- a/libavcodec/mpeg4videoenc.c +++ b/libavcodec/mpeg4videoenc.c @@ -1394,7 +1394,7 @@ static const AVClass mpeg4enc_class = { const FFCodec ff_mpeg4_encoder = { .p.name = "mpeg4", - .p.long_name = NULL_IF_CONFIG_SMALL("MPEG-4 part 2"), + CODEC_LONG_NAME("MPEG-4 part 2"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_MPEG4, .priv_data_size = sizeof(MpegEncContext), diff --git a/libavcodec/mpegaudiodec_fixed.c b/libavcodec/mpegaudiodec_fixed.c index 59e1072ffd..b5b6822a19 100644 --- a/libavcodec/mpegaudiodec_fixed.c +++ b/libavcodec/mpegaudiodec_fixed.c @@ -63,7 +63,7 @@ static const int32_t csa_table[8][4] = { #if CONFIG_MP1_DECODER const FFCodec ff_mp1_decoder = { .p.name = "mp1", - .p.long_name = NULL_IF_CONFIG_SMALL("MP1 (MPEG audio layer 1)"), + CODEC_LONG_NAME("MP1 (MPEG audio layer 1)"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_MP1, .priv_data_size = sizeof(MPADecodeContext), @@ -80,7 +80,7 @@ const FFCodec ff_mp1_decoder = { #if CONFIG_MP2_DECODER const FFCodec ff_mp2_decoder = { .p.name = "mp2", - .p.long_name = NULL_IF_CONFIG_SMALL("MP2 (MPEG audio layer 2)"), + CODEC_LONG_NAME("MP2 (MPEG audio layer 2)"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_MP2, .priv_data_size = sizeof(MPADecodeContext), @@ -97,7 +97,7 @@ const FFCodec ff_mp2_decoder = { #if CONFIG_MP3_DECODER const FFCodec ff_mp3_decoder = { .p.name = "mp3", - .p.long_name = NULL_IF_CONFIG_SMALL("MP3 (MPEG audio layer 3)"), + CODEC_LONG_NAME("MP3 (MPEG audio layer 3)"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_MP3, .priv_data_size = sizeof(MPADecodeContext), @@ -114,7 +114,7 @@ const FFCodec ff_mp3_decoder = { #if CONFIG_MP3ADU_DECODER const FFCodec ff_mp3adu_decoder = { .p.name = "mp3adu", - .p.long_name = NULL_IF_CONFIG_SMALL("ADU (Application Data Unit) MP3 (MPEG audio layer 3)"), + CODEC_LONG_NAME("ADU (Application Data Unit) MP3 (MPEG audio layer 3)"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_MP3ADU, .priv_data_size = sizeof(MPADecodeContext), @@ -131,7 +131,7 @@ const FFCodec ff_mp3adu_decoder = { #if CONFIG_MP3ON4_DECODER const FFCodec ff_mp3on4_decoder = { .p.name = "mp3on4", - .p.long_name = NULL_IF_CONFIG_SMALL("MP3onMP4"), + CODEC_LONG_NAME("MP3onMP4"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_MP3ON4, .priv_data_size = sizeof(MP3On4DecodeContext), diff --git a/libavcodec/mpegaudiodec_float.c b/libavcodec/mpegaudiodec_float.c index 1a83f40c19..ba8c49a3b4 100644 --- a/libavcodec/mpegaudiodec_float.c +++ b/libavcodec/mpegaudiodec_float.c @@ -76,7 +76,7 @@ static const float csa_table[8][4] = { #if CONFIG_MP1FLOAT_DECODER const FFCodec ff_mp1float_decoder = { .p.name = "mp1float", - .p.long_name = NULL_IF_CONFIG_SMALL("MP1 (MPEG audio layer 1)"), + CODEC_LONG_NAME("MP1 (MPEG audio layer 1)"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_MP1, .priv_data_size = sizeof(MPADecodeContext), @@ -93,7 +93,7 @@ const FFCodec ff_mp1float_decoder = { #if CONFIG_MP2FLOAT_DECODER const FFCodec ff_mp2float_decoder = { .p.name = "mp2float", - .p.long_name = NULL_IF_CONFIG_SMALL("MP2 (MPEG audio layer 2)"), + CODEC_LONG_NAME("MP2 (MPEG audio layer 2)"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_MP2, .priv_data_size = sizeof(MPADecodeContext), @@ -110,7 +110,7 @@ const FFCodec ff_mp2float_decoder = { #if CONFIG_MP3FLOAT_DECODER const FFCodec ff_mp3float_decoder = { .p.name = "mp3float", - .p.long_name = NULL_IF_CONFIG_SMALL("MP3 (MPEG audio layer 3)"), + CODEC_LONG_NAME("MP3 (MPEG audio layer 3)"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_MP3, .priv_data_size = sizeof(MPADecodeContext), @@ -127,7 +127,7 @@ const FFCodec ff_mp3float_decoder = { #if CONFIG_MP3ADUFLOAT_DECODER const FFCodec ff_mp3adufloat_decoder = { .p.name = "mp3adufloat", - .p.long_name = NULL_IF_CONFIG_SMALL("ADU (Application Data Unit) MP3 (MPEG audio layer 3)"), + CODEC_LONG_NAME("ADU (Application Data Unit) MP3 (MPEG audio layer 3)"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_MP3ADU, .priv_data_size = sizeof(MPADecodeContext), @@ -144,7 +144,7 @@ const FFCodec ff_mp3adufloat_decoder = { #if CONFIG_MP3ON4FLOAT_DECODER const FFCodec ff_mp3on4float_decoder = { .p.name = "mp3on4float", - .p.long_name = NULL_IF_CONFIG_SMALL("MP3onMP4"), + CODEC_LONG_NAME("MP3onMP4"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_MP3ON4, .priv_data_size = sizeof(MP3On4DecodeContext), diff --git a/libavcodec/mpegaudioenc_fixed.c b/libavcodec/mpegaudioenc_fixed.c index 1191bbc752..3b2bcb3594 100644 --- a/libavcodec/mpegaudioenc_fixed.c +++ b/libavcodec/mpegaudioenc_fixed.c @@ -25,7 +25,7 @@ const FFCodec ff_mp2fixed_encoder = { .p.name = "mp2fixed", - .p.long_name = NULL_IF_CONFIG_SMALL("MP2 fixed point (MPEG audio layer 2)"), + CODEC_LONG_NAME("MP2 fixed point (MPEG audio layer 2)"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_MP2, .p.capabilities = AV_CODEC_CAP_DR1, diff --git a/libavcodec/mpegaudioenc_float.c b/libavcodec/mpegaudioenc_float.c index 6a5bc59bf3..64b5bbda6e 100644 --- a/libavcodec/mpegaudioenc_float.c +++ b/libavcodec/mpegaudioenc_float.c @@ -26,7 +26,7 @@ const FFCodec ff_mp2_encoder = { .p.name = "mp2", - .p.long_name = NULL_IF_CONFIG_SMALL("MP2 (MPEG audio layer 2)"), + CODEC_LONG_NAME("MP2 (MPEG audio layer 2)"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_MP2, .p.capabilities = AV_CODEC_CAP_DR1, diff --git a/libavcodec/mpl2dec.c b/libavcodec/mpl2dec.c index 3645a3a0f6..8639acf0b0 100644 --- a/libavcodec/mpl2dec.c +++ b/libavcodec/mpl2dec.c @@ -83,7 +83,7 @@ static int mpl2_decode_frame(AVCodecContext *avctx, AVSubtitle *sub, const FFCodec ff_mpl2_decoder = { .p.name = "mpl2", - .p.long_name = NULL_IF_CONFIG_SMALL("MPL2 subtitle"), + CODEC_LONG_NAME("MPL2 subtitle"), .p.type = AVMEDIA_TYPE_SUBTITLE, .p.id = AV_CODEC_ID_MPL2, FF_CODEC_DECODE_SUB_CB(mpl2_decode_frame), diff --git a/libavcodec/mscc.c b/libavcodec/mscc.c index 574a3b1526..e8406aa268 100644 --- a/libavcodec/mscc.c +++ b/libavcodec/mscc.c @@ -252,7 +252,7 @@ static av_cold int decode_close(AVCodecContext *avctx) const FFCodec ff_mscc_decoder = { .p.name = "mscc", - .p.long_name = NULL_IF_CONFIG_SMALL("Mandsoft Screen Capture Codec"), + CODEC_LONG_NAME("Mandsoft Screen Capture Codec"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_MSCC, .priv_data_size = sizeof(MSCCContext), @@ -265,7 +265,7 @@ const FFCodec ff_mscc_decoder = { const FFCodec ff_srgc_decoder = { .p.name = "srgc", - .p.long_name = NULL_IF_CONFIG_SMALL("Screen Recorder Gold Codec"), + CODEC_LONG_NAME("Screen Recorder Gold Codec"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_SRGC, .priv_data_size = sizeof(MSCCContext), diff --git a/libavcodec/msmpeg4dec.c b/libavcodec/msmpeg4dec.c index a2b1ab1c9f..05a7ed4db6 100644 --- a/libavcodec/msmpeg4dec.c +++ b/libavcodec/msmpeg4dec.c @@ -866,7 +866,7 @@ void ff_msmpeg4_decode_motion(MpegEncContext *s, int *mx_ptr, int *my_ptr) const FFCodec ff_msmpeg4v1_decoder = { .p.name = "msmpeg4v1", - .p.long_name = NULL_IF_CONFIG_SMALL("MPEG-4 part 2 Microsoft variant version 1"), + CODEC_LONG_NAME("MPEG-4 part 2 Microsoft variant version 1"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_MSMPEG4V1, .priv_data_size = sizeof(MpegEncContext), @@ -884,7 +884,7 @@ const FFCodec ff_msmpeg4v1_decoder = { const FFCodec ff_msmpeg4v2_decoder = { .p.name = "msmpeg4v2", - .p.long_name = NULL_IF_CONFIG_SMALL("MPEG-4 part 2 Microsoft variant version 2"), + CODEC_LONG_NAME("MPEG-4 part 2 Microsoft variant version 2"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_MSMPEG4V2, .priv_data_size = sizeof(MpegEncContext), @@ -902,7 +902,7 @@ const FFCodec ff_msmpeg4v2_decoder = { const FFCodec ff_msmpeg4v3_decoder = { .p.name = "msmpeg4", - .p.long_name = NULL_IF_CONFIG_SMALL("MPEG-4 part 2 Microsoft variant version 3"), + CODEC_LONG_NAME("MPEG-4 part 2 Microsoft variant version 3"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_MSMPEG4V3, .priv_data_size = sizeof(MpegEncContext), @@ -920,7 +920,7 @@ const FFCodec ff_msmpeg4v3_decoder = { const FFCodec ff_wmv1_decoder = { .p.name = "wmv1", - .p.long_name = NULL_IF_CONFIG_SMALL("Windows Media Video 7"), + CODEC_LONG_NAME("Windows Media Video 7"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_WMV1, .priv_data_size = sizeof(MpegEncContext), diff --git a/libavcodec/msmpeg4enc.c b/libavcodec/msmpeg4enc.c index 3bd37d8380..e40acdf3fc 100644 --- a/libavcodec/msmpeg4enc.c +++ b/libavcodec/msmpeg4enc.c @@ -678,7 +678,7 @@ void ff_msmpeg4_encode_block(MpegEncContext * s, int16_t * block, int n) const FFCodec ff_msmpeg4v2_encoder = { .p.name = "msmpeg4v2", - .p.long_name = NULL_IF_CONFIG_SMALL("MPEG-4 part 2 Microsoft variant version 2"), + CODEC_LONG_NAME("MPEG-4 part 2 Microsoft variant version 2"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_MSMPEG4V2, .p.pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE }, @@ -692,7 +692,7 @@ const FFCodec ff_msmpeg4v2_encoder = { const FFCodec ff_msmpeg4v3_encoder = { .p.name = "msmpeg4", - .p.long_name = NULL_IF_CONFIG_SMALL("MPEG-4 part 2 Microsoft variant version 3"), + CODEC_LONG_NAME("MPEG-4 part 2 Microsoft variant version 3"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_MSMPEG4V3, .p.pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE }, @@ -706,7 +706,7 @@ const FFCodec ff_msmpeg4v3_encoder = { const FFCodec ff_wmv1_encoder = { .p.name = "wmv1", - .p.long_name = NULL_IF_CONFIG_SMALL("Windows Media Video 7"), + CODEC_LONG_NAME("Windows Media Video 7"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_WMV1, .p.pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE }, diff --git a/libavcodec/msp2dec.c b/libavcodec/msp2dec.c index f51075e961..9c51c35c61 100644 --- a/libavcodec/msp2dec.c +++ b/libavcodec/msp2dec.c @@ -94,7 +94,7 @@ static int msp2_decode_frame(AVCodecContext *avctx, AVFrame *p, const FFCodec ff_msp2_decoder = { .p.name = "msp2", - .p.long_name = NULL_IF_CONFIG_SMALL("Microsoft Paint (MSP) version 2"), + CODEC_LONG_NAME("Microsoft Paint (MSP) version 2"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_MSP2, .p.capabilities = AV_CODEC_CAP_DR1, diff --git a/libavcodec/msrle.c b/libavcodec/msrle.c index 447d18002c..b6fa7f7abb 100644 --- a/libavcodec/msrle.c +++ b/libavcodec/msrle.c @@ -158,7 +158,7 @@ static av_cold int msrle_decode_end(AVCodecContext *avctx) const FFCodec ff_msrle_decoder = { .p.name = "msrle", - .p.long_name = NULL_IF_CONFIG_SMALL("Microsoft RLE"), + CODEC_LONG_NAME("Microsoft RLE"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_MSRLE, .priv_data_size = sizeof(MsrleContext), diff --git a/libavcodec/mss1.c b/libavcodec/mss1.c index 8a5f00674a..775852102a 100644 --- a/libavcodec/mss1.c +++ b/libavcodec/mss1.c @@ -221,7 +221,7 @@ static av_cold int mss1_decode_end(AVCodecContext *avctx) const FFCodec ff_mss1_decoder = { .p.name = "mss1", - .p.long_name = NULL_IF_CONFIG_SMALL("MS Screen 1"), + CODEC_LONG_NAME("MS Screen 1"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_MSS1, .priv_data_size = sizeof(MSS1Context), diff --git a/libavcodec/mss2.c b/libavcodec/mss2.c index 7dfb626014..d8a30019f7 100644 --- a/libavcodec/mss2.c +++ b/libavcodec/mss2.c @@ -846,7 +846,7 @@ static av_cold int mss2_decode_init(AVCodecContext *avctx) const FFCodec ff_mss2_decoder = { .p.name = "mss2", - .p.long_name = NULL_IF_CONFIG_SMALL("MS Windows Media Video V9 Screen"), + CODEC_LONG_NAME("MS Windows Media Video V9 Screen"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_MSS2, .priv_data_size = sizeof(MSS2Context), diff --git a/libavcodec/mss3.c b/libavcodec/mss3.c index 0464bd12a6..023f110ec8 100644 --- a/libavcodec/mss3.c +++ b/libavcodec/mss3.c @@ -862,7 +862,7 @@ static av_cold int mss3_decode_init(AVCodecContext *avctx) const FFCodec ff_msa1_decoder = { .p.name = "msa1", - .p.long_name = NULL_IF_CONFIG_SMALL("MS ATC Screen"), + CODEC_LONG_NAME("MS ATC Screen"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_MSA1, .priv_data_size = sizeof(MSS3Context), diff --git a/libavcodec/mss4.c b/libavcodec/mss4.c index 21e0536319..dceb42da25 100644 --- a/libavcodec/mss4.c +++ b/libavcodec/mss4.c @@ -611,7 +611,7 @@ static av_cold int mss4_decode_init(AVCodecContext *avctx) const FFCodec ff_mts2_decoder = { .p.name = "mts2", - .p.long_name = NULL_IF_CONFIG_SMALL("MS Expression Encoder Screen"), + CODEC_LONG_NAME("MS Expression Encoder Screen"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_MTS2, .priv_data_size = sizeof(MSS4Context), diff --git a/libavcodec/msvideo1.c b/libavcodec/msvideo1.c index aeb3027b5f..9903ff36a7 100644 --- a/libavcodec/msvideo1.c +++ b/libavcodec/msvideo1.c @@ -340,7 +340,7 @@ static av_cold int msvideo1_decode_end(AVCodecContext *avctx) const FFCodec ff_msvideo1_decoder = { .p.name = "msvideo1", - .p.long_name = NULL_IF_CONFIG_SMALL("Microsoft Video 1"), + CODEC_LONG_NAME("Microsoft Video 1"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_MSVIDEO1, .priv_data_size = sizeof(Msvideo1Context), diff --git a/libavcodec/msvideo1enc.c b/libavcodec/msvideo1enc.c index 4e1e94e9ab..a349b42ca0 100644 --- a/libavcodec/msvideo1enc.c +++ b/libavcodec/msvideo1enc.c @@ -304,7 +304,7 @@ static av_cold int encode_end(AVCodecContext *avctx) const FFCodec ff_msvideo1_encoder = { .p.name = "msvideo1", - .p.long_name = NULL_IF_CONFIG_SMALL("Microsoft Video-1"), + CODEC_LONG_NAME("Microsoft Video-1"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_MSVIDEO1, .priv_data_size = sizeof(Msvideo1EncContext), diff --git a/libavcodec/mv30.c b/libavcodec/mv30.c index 4633fb86bc..03be4ddd9d 100644 --- a/libavcodec/mv30.c +++ b/libavcodec/mv30.c @@ -703,7 +703,7 @@ static av_cold int decode_close(AVCodecContext *avctx) const FFCodec ff_mv30_decoder = { .p.name = "mv30", - .p.long_name = NULL_IF_CONFIG_SMALL("MidiVid 3.0"), + CODEC_LONG_NAME("MidiVid 3.0"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_MV30, .priv_data_size = sizeof(MV30Context), diff --git a/libavcodec/mvcdec.c b/libavcodec/mvcdec.c index 0040ff0853..1e99f44a7d 100644 --- a/libavcodec/mvcdec.c +++ b/libavcodec/mvcdec.c @@ -257,7 +257,7 @@ static int mvc_decode_frame(AVCodecContext *avctx, AVFrame *frame, #if CONFIG_MVC1_DECODER const FFCodec ff_mvc1_decoder = { .p.name = "mvc1", - .p.long_name = NULL_IF_CONFIG_SMALL("Silicon Graphics Motion Video Compressor 1"), + CODEC_LONG_NAME("Silicon Graphics Motion Video Compressor 1"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_MVC1, .priv_data_size = sizeof(MvcContext), @@ -270,7 +270,7 @@ const FFCodec ff_mvc1_decoder = { #if CONFIG_MVC2_DECODER const FFCodec ff_mvc2_decoder = { .p.name = "mvc2", - .p.long_name = NULL_IF_CONFIG_SMALL("Silicon Graphics Motion Video Compressor 2"), + CODEC_LONG_NAME("Silicon Graphics Motion Video Compressor 2"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_MVC2, .priv_data_size = sizeof(MvcContext), diff --git a/libavcodec/mvha.c b/libavcodec/mvha.c index c58fd239a7..b1661c1c3b 100644 --- a/libavcodec/mvha.c +++ b/libavcodec/mvha.c @@ -295,7 +295,7 @@ static av_cold int decode_close(AVCodecContext *avctx) const FFCodec ff_mvha_decoder = { .p.name = "mvha", - .p.long_name = NULL_IF_CONFIG_SMALL("MidiVid Archive Codec"), + CODEC_LONG_NAME("MidiVid Archive Codec"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_MVHA, .priv_data_size = sizeof(MVHAContext), diff --git a/libavcodec/mwsc.c b/libavcodec/mwsc.c index 8d971fa331..f57648bb15 100644 --- a/libavcodec/mwsc.c +++ b/libavcodec/mwsc.c @@ -168,7 +168,7 @@ static av_cold int decode_close(AVCodecContext *avctx) const FFCodec ff_mwsc_decoder = { .p.name = "mwsc", - .p.long_name = NULL_IF_CONFIG_SMALL("MatchWare Screen Capture Codec"), + CODEC_LONG_NAME("MatchWare Screen Capture Codec"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_MWSC, .priv_data_size = sizeof(MWSCContext), diff --git a/libavcodec/mxpegdec.c b/libavcodec/mxpegdec.c index b3862c7791..760b12f0cc 100644 --- a/libavcodec/mxpegdec.c +++ b/libavcodec/mxpegdec.c @@ -344,7 +344,7 @@ the_end: const FFCodec ff_mxpeg_decoder = { .p.name = "mxpeg", - .p.long_name = NULL_IF_CONFIG_SMALL("Mobotix MxPEG video"), + CODEC_LONG_NAME("Mobotix MxPEG video"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_MXPEG, .priv_data_size = sizeof(MXpegDecodeContext), diff --git a/libavcodec/nellymoserdec.c b/libavcodec/nellymoserdec.c index 3f1d1e028c..e6b52f8592 100644 --- a/libavcodec/nellymoserdec.c +++ b/libavcodec/nellymoserdec.c @@ -187,7 +187,7 @@ static av_cold int decode_end(AVCodecContext * avctx) { const FFCodec ff_nellymoser_decoder = { .p.name = "nellymoser", - .p.long_name = NULL_IF_CONFIG_SMALL("Nellymoser Asao"), + CODEC_LONG_NAME("Nellymoser Asao"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_NELLYMOSER, .priv_data_size = sizeof(NellyMoserDecodeContext), diff --git a/libavcodec/nellymoserenc.c b/libavcodec/nellymoserenc.c index 5a50ee6a22..1831d36462 100644 --- a/libavcodec/nellymoserenc.c +++ b/libavcodec/nellymoserenc.c @@ -415,7 +415,7 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *avpkt, const FFCodec ff_nellymoser_encoder = { .p.name = "nellymoser", - .p.long_name = NULL_IF_CONFIG_SMALL("Nellymoser Asao"), + CODEC_LONG_NAME("Nellymoser Asao"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_NELLYMOSER, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY | diff --git a/libavcodec/notchlc.c b/libavcodec/notchlc.c index fce11e97f2..90704e1aeb 100644 --- a/libavcodec/notchlc.c +++ b/libavcodec/notchlc.c @@ -535,7 +535,7 @@ static av_cold int decode_end(AVCodecContext *avctx) const FFCodec ff_notchlc_decoder = { .p.name = "notchlc", - .p.long_name = NULL_IF_CONFIG_SMALL("NotchLC"), + CODEC_LONG_NAME("NotchLC"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_NOTCHLC, .priv_data_size = sizeof(NotchLCContext), diff --git a/libavcodec/nuv.c b/libavcodec/nuv.c index 8dbfa7f726..ccd47586b5 100644 --- a/libavcodec/nuv.c +++ b/libavcodec/nuv.c @@ -361,7 +361,7 @@ static av_cold int decode_end(AVCodecContext *avctx) const FFCodec ff_nuv_decoder = { .p.name = "nuv", - .p.long_name = NULL_IF_CONFIG_SMALL("NuppelVideo/RTJPEG"), + CODEC_LONG_NAME("NuppelVideo/RTJPEG"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_NUV, .priv_data_size = sizeof(NuvContext), diff --git a/libavcodec/nvenc_h264.c b/libavcodec/nvenc_h264.c index 7fa6c23190..a178827291 100644 --- a/libavcodec/nvenc_h264.c +++ b/libavcodec/nvenc_h264.c @@ -221,7 +221,7 @@ static const AVClass h264_nvenc_class = { const FFCodec ff_h264_nvenc_encoder = { .p.name = "h264_nvenc", - .p.long_name = NULL_IF_CONFIG_SMALL("NVIDIA NVENC H.264 encoder"), + CODEC_LONG_NAME("NVIDIA NVENC H.264 encoder"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_H264, .init = ff_nvenc_encode_init, diff --git a/libavcodec/nvenc_hevc.c b/libavcodec/nvenc_hevc.c index 290bb1eb77..ae4d73e497 100644 --- a/libavcodec/nvenc_hevc.c +++ b/libavcodec/nvenc_hevc.c @@ -202,7 +202,7 @@ static const AVClass hevc_nvenc_class = { const FFCodec ff_hevc_nvenc_encoder = { .p.name = "hevc_nvenc", - .p.long_name = NULL_IF_CONFIG_SMALL("NVIDIA NVENC hevc encoder"), + CODEC_LONG_NAME("NVIDIA NVENC hevc encoder"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_HEVC, .init = ff_nvenc_encode_init, diff --git a/libavcodec/omx.c b/libavcodec/omx.c index 97a2cc0ff1..6e667971ea 100644 --- a/libavcodec/omx.c +++ b/libavcodec/omx.c @@ -938,7 +938,7 @@ static const AVClass omx_mpeg4enc_class = { }; const FFCodec ff_mpeg4_omx_encoder = { .p.name = "mpeg4_omx", - .p.long_name = NULL_IF_CONFIG_SMALL("OpenMAX IL MPEG-4 video encoder"), + CODEC_LONG_NAME("OpenMAX IL MPEG-4 video encoder"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_MPEG4, .priv_data_size = sizeof(OMXCodecContext), @@ -959,7 +959,7 @@ static const AVClass omx_h264enc_class = { }; const FFCodec ff_h264_omx_encoder = { .p.name = "h264_omx", - .p.long_name = NULL_IF_CONFIG_SMALL("OpenMAX IL H.264 video encoder"), + CODEC_LONG_NAME("OpenMAX IL H.264 video encoder"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_H264, .priv_data_size = sizeof(OMXCodecContext), diff --git a/libavcodec/on2avc.c b/libavcodec/on2avc.c index 3aadac4baf..411414ee26 100644 --- a/libavcodec/on2avc.c +++ b/libavcodec/on2avc.c @@ -1006,7 +1006,7 @@ static av_cold int on2avc_decode_close(AVCodecContext *avctx) const FFCodec ff_on2avc_decoder = { .p.name = "on2avc", - .p.long_name = NULL_IF_CONFIG_SMALL("On2 Audio for Video Codec"), + CODEC_LONG_NAME("On2 Audio for Video Codec"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_ON2AVC, .priv_data_size = sizeof(On2AVCContext), diff --git a/libavcodec/opusdec.c b/libavcodec/opusdec.c index 792eeb1507..c04aa598b8 100644 --- a/libavcodec/opusdec.c +++ b/libavcodec/opusdec.c @@ -704,7 +704,7 @@ static const AVClass opus_class = { const FFCodec ff_opus_decoder = { .p.name = "opus", - .p.long_name = NULL_IF_CONFIG_SMALL("Opus"), + CODEC_LONG_NAME("Opus"), .p.priv_class = &opus_class, .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_OPUS, diff --git a/libavcodec/opusenc.c b/libavcodec/opusenc.c index 7380051a7d..a7a9d3a5f5 100644 --- a/libavcodec/opusenc.c +++ b/libavcodec/opusenc.c @@ -727,7 +727,7 @@ static const FFCodecDefault opusenc_defaults[] = { const FFCodec ff_opus_encoder = { .p.name = "opus", - .p.long_name = NULL_IF_CONFIG_SMALL("Opus"), + CODEC_LONG_NAME("Opus"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_OPUS, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY | diff --git a/libavcodec/pafaudio.c b/libavcodec/pafaudio.c index 16f440dd87..52566e86fb 100644 --- a/libavcodec/pafaudio.c +++ b/libavcodec/pafaudio.c @@ -75,7 +75,7 @@ static int paf_audio_decode(AVCodecContext *avctx, AVFrame *frame, const FFCodec ff_paf_audio_decoder = { .p.name = "paf_audio", - .p.long_name = NULL_IF_CONFIG_SMALL("Amazing Studio Packed Animation File Audio"), + CODEC_LONG_NAME("Amazing Studio Packed Animation File Audio"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_PAF_AUDIO, .init = paf_audio_init, diff --git a/libavcodec/pafvideo.c b/libavcodec/pafvideo.c index cb57b2a5a6..458fe9ff47 100644 --- a/libavcodec/pafvideo.c +++ b/libavcodec/pafvideo.c @@ -410,7 +410,7 @@ static int paf_video_decode(AVCodecContext *avctx, AVFrame *rframe, const FFCodec ff_paf_video_decoder = { .p.name = "paf_video", - .p.long_name = NULL_IF_CONFIG_SMALL("Amazing Studio Packed Animation File Video"), + CODEC_LONG_NAME("Amazing Studio Packed Animation File Video"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_PAF_VIDEO, .priv_data_size = sizeof(PAFVideoDecContext), diff --git a/libavcodec/pamenc.c b/libavcodec/pamenc.c index 6e934ba7a1..7d01e89f74 100644 --- a/libavcodec/pamenc.c +++ b/libavcodec/pamenc.c @@ -130,7 +130,7 @@ static int pam_encode_frame(AVCodecContext *avctx, AVPacket *pkt, const FFCodec ff_pam_encoder = { .p.name = "pam", - .p.long_name = NULL_IF_CONFIG_SMALL("PAM (Portable AnyMap) image"), + CODEC_LONG_NAME("PAM (Portable AnyMap) image"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_PAM, .p.capabilities = AV_CODEC_CAP_DR1, diff --git a/libavcodec/pcm-bluray.c b/libavcodec/pcm-bluray.c index 365b69b599..f65609514a 100644 --- a/libavcodec/pcm-bluray.c +++ b/libavcodec/pcm-bluray.c @@ -301,7 +301,7 @@ static int pcm_bluray_decode_frame(AVCodecContext *avctx, AVFrame *frame, const FFCodec ff_pcm_bluray_decoder = { .p.name = "pcm_bluray", - .p.long_name = NULL_IF_CONFIG_SMALL("PCM signed 16|20|24-bit big-endian for Blu-ray media"), + CODEC_LONG_NAME("PCM signed 16|20|24-bit big-endian for Blu-ray media"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_PCM_BLURAY, FF_CODEC_DECODE_CB(pcm_bluray_decode_frame), diff --git a/libavcodec/pcm-blurayenc.c b/libavcodec/pcm-blurayenc.c index 6543bc2213..1f1a3a27d8 100644 --- a/libavcodec/pcm-blurayenc.c +++ b/libavcodec/pcm-blurayenc.c @@ -272,7 +272,7 @@ static int pcm_bluray_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, const FFCodec ff_pcm_bluray_encoder = { .p.name = "pcm_bluray", - .p.long_name = NULL_IF_CONFIG_SMALL("PCM signed 16|20|24-bit big-endian for Blu-ray media"), + CODEC_LONG_NAME("PCM signed 16|20|24-bit big-endian for Blu-ray media"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_PCM_BLURAY, .priv_data_size = sizeof(BlurayPCMEncContext), diff --git a/libavcodec/pcm-dvd.c b/libavcodec/pcm-dvd.c index 358c9d5b0f..419b2a138f 100644 --- a/libavcodec/pcm-dvd.c +++ b/libavcodec/pcm-dvd.c @@ -297,7 +297,7 @@ static int pcm_dvd_decode_frame(AVCodecContext *avctx, AVFrame *frame, const FFCodec ff_pcm_dvd_decoder = { .p.name = "pcm_dvd", - .p.long_name = NULL_IF_CONFIG_SMALL("PCM signed 16|20|24-bit big-endian for DVD media"), + CODEC_LONG_NAME("PCM signed 16|20|24-bit big-endian for DVD media"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_PCM_DVD, .priv_data_size = sizeof(PCMDVDContext), diff --git a/libavcodec/pcm-dvdenc.c b/libavcodec/pcm-dvdenc.c index 4bc635ab1f..e9349680e8 100644 --- a/libavcodec/pcm-dvdenc.c +++ b/libavcodec/pcm-dvdenc.c @@ -173,7 +173,7 @@ static int pcm_dvd_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, const FFCodec ff_pcm_dvd_encoder = { .p.name = "pcm_dvd", - .p.long_name = NULL_IF_CONFIG_SMALL("PCM signed 16|20|24-bit big-endian for DVD media"), + CODEC_LONG_NAME("PCM signed 16|20|24-bit big-endian for DVD media"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_PCM_DVD, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_SMALL_LAST_FRAME, diff --git a/libavcodec/pcm.c b/libavcodec/pcm.c index 8e87679329..fcb8ae1c2c 100644 --- a/libavcodec/pcm.c +++ b/libavcodec/pcm.c @@ -555,7 +555,7 @@ static int pcm_decode_frame(AVCodecContext *avctx, AVFrame *frame, #define PCM_ENCODER_1(id_, sample_fmt_, name_, long_name_) \ const FFCodec ff_ ## name_ ## _encoder = { \ .p.name = #name_, \ - .p.long_name = NULL_IF_CONFIG_SMALL(long_name_), \ + CODEC_LONG_NAME(long_name_), \ .p.type = AVMEDIA_TYPE_AUDIO, \ .p.id = AV_CODEC_ID_ ## id_, \ .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_VARIABLE_FRAME_SIZE, \ @@ -576,7 +576,7 @@ const FFCodec ff_ ## name_ ## _encoder = { \ #define PCM_DECODER_1(id_, sample_fmt_, name_, long_name_) \ const FFCodec ff_ ## name_ ## _decoder = { \ .p.name = #name_, \ - .p.long_name = NULL_IF_CONFIG_SMALL(long_name_), \ + CODEC_LONG_NAME(long_name_), \ .p.type = AVMEDIA_TYPE_AUDIO, \ .p.id = AV_CODEC_ID_ ## id_, \ .priv_data_size = sizeof(PCMDecode), \ diff --git a/libavcodec/pcx.c b/libavcodec/pcx.c index 3b82e5ba3e..4cca497298 100644 --- a/libavcodec/pcx.c +++ b/libavcodec/pcx.c @@ -250,7 +250,7 @@ end: const FFCodec ff_pcx_decoder = { .p.name = "pcx", - .p.long_name = NULL_IF_CONFIG_SMALL("PC Paintbrush PCX image"), + CODEC_LONG_NAME("PC Paintbrush PCX image"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_PCX, FF_CODEC_DECODE_CB(pcx_decode_frame), diff --git a/libavcodec/pcxenc.c b/libavcodec/pcxenc.c index 1d344994de..509158ba0f 100644 --- a/libavcodec/pcxenc.c +++ b/libavcodec/pcxenc.c @@ -194,7 +194,7 @@ static int pcx_encode_frame(AVCodecContext *avctx, AVPacket *pkt, const FFCodec ff_pcx_encoder = { .p.name = "pcx", - .p.long_name = NULL_IF_CONFIG_SMALL("PC Paintbrush PCX image"), + CODEC_LONG_NAME("PC Paintbrush PCX image"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_PCX, .p.capabilities = AV_CODEC_CAP_DR1, diff --git a/libavcodec/pgssubdec.c b/libavcodec/pgssubdec.c index 69aabfe2b0..5f76f12615 100644 --- a/libavcodec/pgssubdec.c +++ b/libavcodec/pgssubdec.c @@ -691,7 +691,7 @@ static const AVClass pgsdec_class = { const FFCodec ff_pgssub_decoder = { .p.name = "pgssub", - .p.long_name = NULL_IF_CONFIG_SMALL("HDMV Presentation Graphic Stream subtitles"), + CODEC_LONG_NAME("HDMV Presentation Graphic Stream subtitles"), .p.type = AVMEDIA_TYPE_SUBTITLE, .p.id = AV_CODEC_ID_HDMV_PGS_SUBTITLE, .priv_data_size = sizeof(PGSSubContext), diff --git a/libavcodec/pgxdec.c b/libavcodec/pgxdec.c index 177ad66468..e5d1df784e 100644 --- a/libavcodec/pgxdec.c +++ b/libavcodec/pgxdec.c @@ -152,7 +152,7 @@ static int pgx_decode_frame(AVCodecContext *avctx, AVFrame *p, const FFCodec ff_pgx_decoder = { .p.name = "pgx", - .p.long_name = NULL_IF_CONFIG_SMALL("PGX (JPEG2000 Test Format)"), + CODEC_LONG_NAME("PGX (JPEG2000 Test Format)"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_PGX, .p.capabilities = AV_CODEC_CAP_DR1, diff --git a/libavcodec/photocd.c b/libavcodec/photocd.c index b31666d78a..f0e1ef7796 100644 --- a/libavcodec/photocd.c +++ b/libavcodec/photocd.c @@ -466,5 +466,5 @@ const FFCodec ff_photocd_decoder = { .close = photocd_decode_close, FF_CODEC_DECODE_CB(photocd_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS, - .p.long_name = NULL_IF_CONFIG_SMALL("Kodak Photo CD"), + CODEC_LONG_NAME("Kodak Photo CD"), }; diff --git a/libavcodec/pictordec.c b/libavcodec/pictordec.c index fcd9e8a9ed..71bad40a0a 100644 --- a/libavcodec/pictordec.c +++ b/libavcodec/pictordec.c @@ -281,7 +281,7 @@ finish: const FFCodec ff_pictor_decoder = { .p.name = "pictor", - .p.long_name = NULL_IF_CONFIG_SMALL("Pictor/PC Paint"), + CODEC_LONG_NAME("Pictor/PC Paint"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_PICTOR, .p.capabilities = AV_CODEC_CAP_DR1, diff --git a/libavcodec/pixlet.c b/libavcodec/pixlet.c index d7c40052a5..b349d397f4 100644 --- a/libavcodec/pixlet.c +++ b/libavcodec/pixlet.c @@ -692,7 +692,7 @@ static int pixlet_decode_frame(AVCodecContext *avctx, AVFrame *p, const FFCodec ff_pixlet_decoder = { .p.name = "pixlet", - .p.long_name = NULL_IF_CONFIG_SMALL("Apple Pixlet"), + CODEC_LONG_NAME("Apple Pixlet"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_PIXLET, .init = pixlet_init, diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c index 7cb3d98bd6..9e7d9b589f 100644 --- a/libavcodec/pngdec.c +++ b/libavcodec/pngdec.c @@ -1715,7 +1715,7 @@ static av_cold int png_dec_end(AVCodecContext *avctx) #if CONFIG_APNG_DECODER const FFCodec ff_apng_decoder = { .p.name = "apng", - .p.long_name = NULL_IF_CONFIG_SMALL("APNG (Animated Portable Network Graphics) image"), + CODEC_LONG_NAME("APNG (Animated Portable Network Graphics) image"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_APNG, .priv_data_size = sizeof(PNGDecContext), @@ -1733,7 +1733,7 @@ const FFCodec ff_apng_decoder = { #if CONFIG_PNG_DECODER const FFCodec ff_png_decoder = { .p.name = "png", - .p.long_name = NULL_IF_CONFIG_SMALL("PNG (Portable Network Graphics) image"), + CODEC_LONG_NAME("PNG (Portable Network Graphics) image"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_PNG, .priv_data_size = sizeof(PNGDecContext), diff --git a/libavcodec/pngenc.c b/libavcodec/pngenc.c index 7c1cc55c34..ca1a186ca8 100644 --- a/libavcodec/pngenc.c +++ b/libavcodec/pngenc.c @@ -1193,7 +1193,7 @@ static const AVClass pngenc_class = { const FFCodec ff_png_encoder = { .p.name = "png", - .p.long_name = NULL_IF_CONFIG_SMALL("PNG (Portable Network Graphics) image"), + CODEC_LONG_NAME("PNG (Portable Network Graphics) image"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_PNG, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS, @@ -1215,7 +1215,7 @@ const FFCodec ff_png_encoder = { const FFCodec ff_apng_encoder = { .p.name = "apng", - .p.long_name = NULL_IF_CONFIG_SMALL("APNG (Animated Portable Network Graphics) image"), + CODEC_LONG_NAME("APNG (Animated Portable Network Graphics) image"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_APNG, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY, diff --git a/libavcodec/pnmdec.c b/libavcodec/pnmdec.c index 6e807a7ac1..6ba54ddccd 100644 --- a/libavcodec/pnmdec.c +++ b/libavcodec/pnmdec.c @@ -403,7 +403,7 @@ static int pnm_decode_frame(AVCodecContext *avctx, AVFrame *p, #if CONFIG_PGM_DECODER const FFCodec ff_pgm_decoder = { .p.name = "pgm", - .p.long_name = NULL_IF_CONFIG_SMALL("PGM (Portable GrayMap) image"), + CODEC_LONG_NAME("PGM (Portable GrayMap) image"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_PGM, .p.capabilities = AV_CODEC_CAP_DR1, @@ -415,7 +415,7 @@ const FFCodec ff_pgm_decoder = { #if CONFIG_PGMYUV_DECODER const FFCodec ff_pgmyuv_decoder = { .p.name = "pgmyuv", - .p.long_name = NULL_IF_CONFIG_SMALL("PGMYUV (Portable GrayMap YUV) image"), + CODEC_LONG_NAME("PGMYUV (Portable GrayMap YUV) image"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_PGMYUV, .p.capabilities = AV_CODEC_CAP_DR1, @@ -427,7 +427,7 @@ const FFCodec ff_pgmyuv_decoder = { #if CONFIG_PPM_DECODER const FFCodec ff_ppm_decoder = { .p.name = "ppm", - .p.long_name = NULL_IF_CONFIG_SMALL("PPM (Portable PixelMap) image"), + CODEC_LONG_NAME("PPM (Portable PixelMap) image"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_PPM, .p.capabilities = AV_CODEC_CAP_DR1, @@ -439,7 +439,7 @@ const FFCodec ff_ppm_decoder = { #if CONFIG_PBM_DECODER const FFCodec ff_pbm_decoder = { .p.name = "pbm", - .p.long_name = NULL_IF_CONFIG_SMALL("PBM (Portable BitMap) image"), + CODEC_LONG_NAME("PBM (Portable BitMap) image"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_PBM, .p.capabilities = AV_CODEC_CAP_DR1, @@ -451,7 +451,7 @@ const FFCodec ff_pbm_decoder = { #if CONFIG_PAM_DECODER const FFCodec ff_pam_decoder = { .p.name = "pam", - .p.long_name = NULL_IF_CONFIG_SMALL("PAM (Portable AnyMap) image"), + CODEC_LONG_NAME("PAM (Portable AnyMap) image"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_PAM, .p.capabilities = AV_CODEC_CAP_DR1, @@ -463,7 +463,7 @@ const FFCodec ff_pam_decoder = { #if CONFIG_PFM_DECODER const FFCodec ff_pfm_decoder = { .p.name = "pfm", - .p.long_name = NULL_IF_CONFIG_SMALL("PFM (Portable FloatMap) image"), + CODEC_LONG_NAME("PFM (Portable FloatMap) image"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_PFM, .p.capabilities = AV_CODEC_CAP_DR1, @@ -484,7 +484,7 @@ static av_cold int phm_dec_init(AVCodecContext *avctx) const FFCodec ff_phm_decoder = { .p.name = "phm", - .p.long_name = NULL_IF_CONFIG_SMALL("PHM (Portable HalfFloatMap) image"), + CODEC_LONG_NAME("PHM (Portable HalfFloatMap) image"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_PHM, .p.capabilities = AV_CODEC_CAP_DR1, diff --git a/libavcodec/pnmenc.c b/libavcodec/pnmenc.c index b052c03b21..9eb663306d 100644 --- a/libavcodec/pnmenc.c +++ b/libavcodec/pnmenc.c @@ -221,7 +221,7 @@ static int pnm_encode_frame(AVCodecContext *avctx, AVPacket *pkt, #if CONFIG_PGM_ENCODER const FFCodec ff_pgm_encoder = { .p.name = "pgm", - .p.long_name = NULL_IF_CONFIG_SMALL("PGM (Portable GrayMap) image"), + CODEC_LONG_NAME("PGM (Portable GrayMap) image"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_PGM, .p.capabilities = AV_CODEC_CAP_DR1, @@ -235,7 +235,7 @@ const FFCodec ff_pgm_encoder = { #if CONFIG_PGMYUV_ENCODER const FFCodec ff_pgmyuv_encoder = { .p.name = "pgmyuv", - .p.long_name = NULL_IF_CONFIG_SMALL("PGMYUV (Portable GrayMap YUV) image"), + CODEC_LONG_NAME("PGMYUV (Portable GrayMap YUV) image"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_PGMYUV, .p.capabilities = AV_CODEC_CAP_DR1, @@ -249,7 +249,7 @@ const FFCodec ff_pgmyuv_encoder = { #if CONFIG_PPM_ENCODER const FFCodec ff_ppm_encoder = { .p.name = "ppm", - .p.long_name = NULL_IF_CONFIG_SMALL("PPM (Portable PixelMap) image"), + CODEC_LONG_NAME("PPM (Portable PixelMap) image"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_PPM, .p.capabilities = AV_CODEC_CAP_DR1, @@ -263,7 +263,7 @@ const FFCodec ff_ppm_encoder = { #if CONFIG_PBM_ENCODER const FFCodec ff_pbm_encoder = { .p.name = "pbm", - .p.long_name = NULL_IF_CONFIG_SMALL("PBM (Portable BitMap) image"), + CODEC_LONG_NAME("PBM (Portable BitMap) image"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_PBM, .p.capabilities = AV_CODEC_CAP_DR1, @@ -276,7 +276,7 @@ const FFCodec ff_pbm_encoder = { #if CONFIG_PFM_ENCODER const FFCodec ff_pfm_encoder = { .p.name = "pfm", - .p.long_name = NULL_IF_CONFIG_SMALL("PFM (Portable FloatMap) image"), + CODEC_LONG_NAME("PFM (Portable FloatMap) image"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_PFM, .p.capabilities = AV_CODEC_CAP_DR1, @@ -301,7 +301,7 @@ static av_cold int phm_enc_init(AVCodecContext *avctx) const FFCodec ff_phm_encoder = { .p.name = "phm", - .p.long_name = NULL_IF_CONFIG_SMALL("PHM (Portable HalfFloatMap) image"), + CODEC_LONG_NAME("PHM (Portable HalfFloatMap) image"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_PHM, .p.capabilities = AV_CODEC_CAP_DR1, diff --git a/libavcodec/proresdec2.c b/libavcodec/proresdec2.c index df864c77ec..68b29deadb 100644 --- a/libavcodec/proresdec2.c +++ b/libavcodec/proresdec2.c @@ -871,7 +871,7 @@ static int update_thread_context(AVCodecContext *dst, const AVCodecContext *src) const FFCodec ff_prores_decoder = { .p.name = "prores", - .p.long_name = NULL_IF_CONFIG_SMALL("Apple ProRes (iCodec Pro)"), + CODEC_LONG_NAME("Apple ProRes (iCodec Pro)"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_PRORES, .priv_data_size = sizeof(ProresContext), diff --git a/libavcodec/proresenc_anatoliy.c b/libavcodec/proresenc_anatoliy.c index 482f09415d..5fa5f1fd69 100644 --- a/libavcodec/proresenc_anatoliy.c +++ b/libavcodec/proresenc_anatoliy.c @@ -942,7 +942,7 @@ static const enum AVPixelFormat pix_fmts[] = { const FFCodec ff_prores_aw_encoder = { .p.name = "prores_aw", - .p.long_name = NULL_IF_CONFIG_SMALL("Apple ProRes"), + CODEC_LONG_NAME("Apple ProRes"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_PRORES, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS, @@ -958,7 +958,7 @@ const FFCodec ff_prores_aw_encoder = { const FFCodec ff_prores_encoder = { .p.name = "prores", - .p.long_name = NULL_IF_CONFIG_SMALL("Apple ProRes"), + CODEC_LONG_NAME("Apple ProRes"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_PRORES, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS, diff --git a/libavcodec/proresenc_kostya.c b/libavcodec/proresenc_kostya.c index 60bb2286f8..5b38437d0a 100644 --- a/libavcodec/proresenc_kostya.c +++ b/libavcodec/proresenc_kostya.c @@ -1421,7 +1421,7 @@ static const AVClass proresenc_class = { const FFCodec ff_prores_ks_encoder = { .p.name = "prores_ks", - .p.long_name = NULL_IF_CONFIG_SMALL("Apple ProRes (iCodec Pro)"), + CODEC_LONG_NAME("Apple ProRes (iCodec Pro)"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_PRORES, .priv_data_size = sizeof(ProresContext), diff --git a/libavcodec/prosumer.c b/libavcodec/prosumer.c index 974b1657c3..e199d1aaa9 100644 --- a/libavcodec/prosumer.c +++ b/libavcodec/prosumer.c @@ -366,7 +366,7 @@ static av_cold int decode_close(AVCodecContext *avctx) const FFCodec ff_prosumer_decoder = { .p.name = "prosumer", - .p.long_name = NULL_IF_CONFIG_SMALL("Brooktree ProSumer Video"), + CODEC_LONG_NAME("Brooktree ProSumer Video"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_PROSUMER, .priv_data_size = sizeof(ProSumerContext), diff --git a/libavcodec/psd.c b/libavcodec/psd.c index 3ac3f46dd5..ee96bd1237 100644 --- a/libavcodec/psd.c +++ b/libavcodec/psd.c @@ -546,7 +546,7 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *picture, const FFCodec ff_psd_decoder = { .p.name = "psd", - .p.long_name = NULL_IF_CONFIG_SMALL("Photoshop PSD file"), + CODEC_LONG_NAME("Photoshop PSD file"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_PSD, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS, diff --git a/libavcodec/ptx.c b/libavcodec/ptx.c index 84fe1872d2..ef0b6a306d 100644 --- a/libavcodec/ptx.c +++ b/libavcodec/ptx.c @@ -87,7 +87,7 @@ static int ptx_decode_frame(AVCodecContext *avctx, AVFrame *p, const FFCodec ff_ptx_decoder = { .p.name = "ptx", - .p.long_name = NULL_IF_CONFIG_SMALL("V.Flash PTX image"), + CODEC_LONG_NAME("V.Flash PTX image"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_PTX, .p.capabilities = AV_CODEC_CAP_DR1, diff --git a/libavcodec/qcelpdec.c b/libavcodec/qcelpdec.c index f9da514834..277c55100a 100644 --- a/libavcodec/qcelpdec.c +++ b/libavcodec/qcelpdec.c @@ -790,7 +790,7 @@ erasure: const FFCodec ff_qcelp_decoder = { .p.name = "qcelp", - .p.long_name = NULL_IF_CONFIG_SMALL("QCELP / PureVoice"), + CODEC_LONG_NAME("QCELP / PureVoice"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_QCELP, .init = qcelp_decode_init, diff --git a/libavcodec/qdm2.c b/libavcodec/qdm2.c index 51ca1fb516..bdf7310b42 100644 --- a/libavcodec/qdm2.c +++ b/libavcodec/qdm2.c @@ -1870,7 +1870,7 @@ static int qdm2_decode_frame(AVCodecContext *avctx, AVFrame *frame, const FFCodec ff_qdm2_decoder = { .p.name = "qdm2", - .p.long_name = NULL_IF_CONFIG_SMALL("QDesign Music Codec 2"), + CODEC_LONG_NAME("QDesign Music Codec 2"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_QDM2, .priv_data_size = sizeof(QDM2Context), diff --git a/libavcodec/qdmc.c b/libavcodec/qdmc.c index 77bb8d1742..4b582dc349 100644 --- a/libavcodec/qdmc.c +++ b/libavcodec/qdmc.c @@ -729,7 +729,7 @@ static int qdmc_decode_frame(AVCodecContext *avctx, AVFrame *frame, const FFCodec ff_qdmc_decoder = { .p.name = "qdmc", - .p.long_name = NULL_IF_CONFIG_SMALL("QDesign Music Codec 1"), + CODEC_LONG_NAME("QDesign Music Codec 1"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_QDMC, .priv_data_size = sizeof(QDMCContext), diff --git a/libavcodec/qdrw.c b/libavcodec/qdrw.c index 4405ff2b4e..e41451e9a7 100644 --- a/libavcodec/qdrw.c +++ b/libavcodec/qdrw.c @@ -515,7 +515,7 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *p, const FFCodec ff_qdraw_decoder = { .p.name = "qdraw", - .p.long_name = NULL_IF_CONFIG_SMALL("Apple QuickDraw"), + CODEC_LONG_NAME("Apple QuickDraw"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_QDRAW, .p.capabilities = AV_CODEC_CAP_DR1, diff --git a/libavcodec/qoidec.c b/libavcodec/qoidec.c index 1053d784a2..d218d649de 100644 --- a/libavcodec/qoidec.c +++ b/libavcodec/qoidec.c @@ -114,7 +114,7 @@ static int qoi_decode_frame(AVCodecContext *avctx, AVFrame *p, const FFCodec ff_qoi_decoder = { .p.name = "qoi", - .p.long_name = NULL_IF_CONFIG_SMALL("QOI (Quite OK Image format) image"), + CODEC_LONG_NAME("QOI (Quite OK Image format) image"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_QOI, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS, diff --git a/libavcodec/qoienc.c b/libavcodec/qoienc.c index 9a18c2a357..6d574e0da9 100644 --- a/libavcodec/qoienc.c +++ b/libavcodec/qoienc.c @@ -128,7 +128,7 @@ static int qoi_encode_frame(AVCodecContext *avctx, AVPacket *pkt, const FFCodec ff_qoi_encoder = { .p.name = "qoi", - .p.long_name = NULL_IF_CONFIG_SMALL("QOI (Quite OK Image format) image"), + CODEC_LONG_NAME("QOI (Quite OK Image format) image"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_QOI, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS, diff --git a/libavcodec/qpeg.c b/libavcodec/qpeg.c index ea11e10b1a..5bca338acf 100644 --- a/libavcodec/qpeg.c +++ b/libavcodec/qpeg.c @@ -352,7 +352,7 @@ static av_cold int decode_init(AVCodecContext *avctx){ const FFCodec ff_qpeg_decoder = { .p.name = "qpeg", - .p.long_name = NULL_IF_CONFIG_SMALL("Q-team QPEG"), + CODEC_LONG_NAME("Q-team QPEG"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_QPEG, .priv_data_size = sizeof(QpegContext), diff --git a/libavcodec/qsvdec.c b/libavcodec/qsvdec.c index 89ec5dcee8..0f0d719e23 100644 --- a/libavcodec/qsvdec.c +++ b/libavcodec/qsvdec.c @@ -1026,7 +1026,7 @@ static const AVClass x##_qsv_class = { \ }; \ const FFCodec ff_##x##_qsv_decoder = { \ .p.name = #x "_qsv", \ - .p.long_name = NULL_IF_CONFIG_SMALL(#X " video (Intel Quick Sync Video acceleration)"), \ + CODEC_LONG_NAME(#X " video (Intel Quick Sync Video acceleration)"), \ .priv_data_size = sizeof(QSVDecContext), \ .p.type = AVMEDIA_TYPE_VIDEO, \ .p.id = AV_CODEC_ID_##X, \ diff --git a/libavcodec/qsvenc_h264.c b/libavcodec/qsvenc_h264.c index a0dc31e24a..1bbdc45203 100644 --- a/libavcodec/qsvenc_h264.c +++ b/libavcodec/qsvenc_h264.c @@ -186,7 +186,7 @@ static const FFCodecDefault qsv_enc_defaults[] = { const FFCodec ff_h264_qsv_encoder = { .p.name = "h264_qsv", - .p.long_name = NULL_IF_CONFIG_SMALL("H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10 (Intel Quick Sync Video acceleration)"), + CODEC_LONG_NAME("H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10 (Intel Quick Sync Video acceleration)"), .priv_data_size = sizeof(QSVH264EncContext), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_H264, diff --git a/libavcodec/qsvenc_hevc.c b/libavcodec/qsvenc_hevc.c index e59747fda3..5986c3f1a6 100644 --- a/libavcodec/qsvenc_hevc.c +++ b/libavcodec/qsvenc_hevc.c @@ -299,7 +299,7 @@ static const FFCodecDefault qsv_enc_defaults[] = { const FFCodec ff_hevc_qsv_encoder = { .p.name = "hevc_qsv", - .p.long_name = NULL_IF_CONFIG_SMALL("HEVC (Intel Quick Sync Video acceleration)"), + CODEC_LONG_NAME("HEVC (Intel Quick Sync Video acceleration)"), .priv_data_size = sizeof(QSVHEVCEncContext), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_HEVC, diff --git a/libavcodec/qsvenc_jpeg.c b/libavcodec/qsvenc_jpeg.c index 6d17d896eb..2469ef7c9f 100644 --- a/libavcodec/qsvenc_jpeg.c +++ b/libavcodec/qsvenc_jpeg.c @@ -80,7 +80,7 @@ static const FFCodecDefault qsv_enc_defaults[] = { const FFCodec ff_mjpeg_qsv_encoder = { .p.name = "mjpeg_qsv", - .p.long_name = NULL_IF_CONFIG_SMALL("MJPEG (Intel Quick Sync Video acceleration)"), + CODEC_LONG_NAME("MJPEG (Intel Quick Sync Video acceleration)"), .priv_data_size = sizeof(QSVMJPEGEncContext), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_MJPEG, diff --git a/libavcodec/qsvenc_mpeg2.c b/libavcodec/qsvenc_mpeg2.c index 5666b3e6e2..22f1ff7c0d 100644 --- a/libavcodec/qsvenc_mpeg2.c +++ b/libavcodec/qsvenc_mpeg2.c @@ -94,7 +94,7 @@ static const FFCodecDefault qsv_enc_defaults[] = { const FFCodec ff_mpeg2_qsv_encoder = { .p.name = "mpeg2_qsv", - .p.long_name = NULL_IF_CONFIG_SMALL("MPEG-2 video (Intel Quick Sync Video acceleration)"), + CODEC_LONG_NAME("MPEG-2 video (Intel Quick Sync Video acceleration)"), .priv_data_size = sizeof(QSVMpeg2EncContext), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_MPEG2VIDEO, diff --git a/libavcodec/qsvenc_vp9.c b/libavcodec/qsvenc_vp9.c index c738da3904..61d50156d3 100644 --- a/libavcodec/qsvenc_vp9.c +++ b/libavcodec/qsvenc_vp9.c @@ -103,7 +103,7 @@ static const FFCodecDefault qsv_enc_defaults[] = { const FFCodec ff_vp9_qsv_encoder = { .p.name = "vp9_qsv", - .p.long_name = NULL_IF_CONFIG_SMALL("VP9 video (Intel Quick Sync Video acceleration)"), + CODEC_LONG_NAME("VP9 video (Intel Quick Sync Video acceleration)"), .priv_data_size = sizeof(QSVVP9EncContext), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_VP9, diff --git a/libavcodec/qtrle.c b/libavcodec/qtrle.c index 569c68359b..5cb18c86c2 100644 --- a/libavcodec/qtrle.c +++ b/libavcodec/qtrle.c @@ -580,7 +580,7 @@ static av_cold int qtrle_decode_end(AVCodecContext *avctx) const FFCodec ff_qtrle_decoder = { .p.name = "qtrle", - .p.long_name = NULL_IF_CONFIG_SMALL("QuickTime Animation (RLE) video"), + CODEC_LONG_NAME("QuickTime Animation (RLE) video"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_QTRLE, .priv_data_size = sizeof(QtrleContext), diff --git a/libavcodec/qtrleenc.c b/libavcodec/qtrleenc.c index 3962c08356..855494d3df 100644 --- a/libavcodec/qtrleenc.c +++ b/libavcodec/qtrleenc.c @@ -401,7 +401,7 @@ static int qtrle_encode_frame(AVCodecContext *avctx, AVPacket *pkt, const FFCodec ff_qtrle_encoder = { .p.name = "qtrle", - .p.long_name = NULL_IF_CONFIG_SMALL("QuickTime Animation (RLE) video"), + CODEC_LONG_NAME("QuickTime Animation (RLE) video"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_QTRLE, .p.capabilities = AV_CODEC_CAP_DR1, diff --git a/libavcodec/r210dec.c b/libavcodec/r210dec.c index 163e203c73..ae80f46eb6 100644 --- a/libavcodec/r210dec.c +++ b/libavcodec/r210dec.c @@ -105,7 +105,7 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *pic, #if CONFIG_R210_DECODER const FFCodec ff_r210_decoder = { .p.name = "r210", - .p.long_name = NULL_IF_CONFIG_SMALL("Uncompressed RGB 10-bit"), + CODEC_LONG_NAME("Uncompressed RGB 10-bit"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_R210, .init = decode_init, @@ -116,7 +116,7 @@ const FFCodec ff_r210_decoder = { #if CONFIG_R10K_DECODER const FFCodec ff_r10k_decoder = { .p.name = "r10k", - .p.long_name = NULL_IF_CONFIG_SMALL("AJA Kona 10-bit RGB Codec"), + CODEC_LONG_NAME("AJA Kona 10-bit RGB Codec"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_R10K, .init = decode_init, @@ -127,7 +127,7 @@ const FFCodec ff_r10k_decoder = { #if CONFIG_AVRP_DECODER const FFCodec ff_avrp_decoder = { .p.name = "avrp", - .p.long_name = NULL_IF_CONFIG_SMALL("Avid 1:1 10-bit RGB Packer"), + CODEC_LONG_NAME("Avid 1:1 10-bit RGB Packer"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_AVRP, .init = decode_init, diff --git a/libavcodec/r210enc.c b/libavcodec/r210enc.c index 139e5b75eb..d87f42ce4a 100644 --- a/libavcodec/r210enc.c +++ b/libavcodec/r210enc.c @@ -93,7 +93,7 @@ static const enum AVPixelFormat pix_fmt[] = { AV_PIX_FMT_GBRP10, AV_PIX_FMT_NONE #if CONFIG_R210_ENCODER const FFCodec ff_r210_encoder = { .p.name = "r210", - .p.long_name = NULL_IF_CONFIG_SMALL("Uncompressed RGB 10-bit"), + CODEC_LONG_NAME("Uncompressed RGB 10-bit"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_R210, .p.capabilities = AV_CODEC_CAP_DR1, @@ -105,7 +105,7 @@ const FFCodec ff_r210_encoder = { #if CONFIG_R10K_ENCODER const FFCodec ff_r10k_encoder = { .p.name = "r10k", - .p.long_name = NULL_IF_CONFIG_SMALL("AJA Kona 10-bit RGB Codec"), + CODEC_LONG_NAME("AJA Kona 10-bit RGB Codec"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_R10K, .p.capabilities = AV_CODEC_CAP_DR1, @@ -117,7 +117,7 @@ const FFCodec ff_r10k_encoder = { #if CONFIG_AVRP_ENCODER const FFCodec ff_avrp_encoder = { .p.name = "avrp", - .p.long_name = NULL_IF_CONFIG_SMALL("Avid 1:1 10-bit RGB Packer"), + CODEC_LONG_NAME("Avid 1:1 10-bit RGB Packer"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_AVRP, .p.capabilities = AV_CODEC_CAP_DR1, diff --git a/libavcodec/ra144dec.c b/libavcodec/ra144dec.c index f9c0900de0..943e84e1f8 100644 --- a/libavcodec/ra144dec.c +++ b/libavcodec/ra144dec.c @@ -128,7 +128,7 @@ static int ra144_decode_frame(AVCodecContext * avctx, AVFrame *frame, const FFCodec ff_ra_144_decoder = { .p.name = "real_144", - .p.long_name = NULL_IF_CONFIG_SMALL("RealAudio 1.0 (14.4K)"), + CODEC_LONG_NAME("RealAudio 1.0 (14.4K)"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_RA_144, .priv_data_size = sizeof(RA144Context), diff --git a/libavcodec/ra144enc.c b/libavcodec/ra144enc.c index 1608b9463e..d9448e88c8 100644 --- a/libavcodec/ra144enc.c +++ b/libavcodec/ra144enc.c @@ -537,7 +537,7 @@ static int ra144_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, const FFCodec ff_ra_144_encoder = { .p.name = "real_144", - .p.long_name = NULL_IF_CONFIG_SMALL("RealAudio 1.0 (14.4K)"), + CODEC_LONG_NAME("RealAudio 1.0 (14.4K)"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_RA_144, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY | diff --git a/libavcodec/ra288.c b/libavcodec/ra288.c index 73242669d3..c8c20e4884 100644 --- a/libavcodec/ra288.c +++ b/libavcodec/ra288.c @@ -239,7 +239,7 @@ static int ra288_decode_frame(AVCodecContext * avctx, AVFrame *frame, const FFCodec ff_ra_288_decoder = { .p.name = "real_288", - .p.long_name = NULL_IF_CONFIG_SMALL("RealAudio 2.0 (28.8K)"), + CODEC_LONG_NAME("RealAudio 2.0 (28.8K)"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_RA_288, .priv_data_size = sizeof(RA288Context), diff --git a/libavcodec/ralf.c b/libavcodec/ralf.c index 5efa919e09..20c5f060d0 100644 --- a/libavcodec/ralf.c +++ b/libavcodec/ralf.c @@ -515,7 +515,7 @@ static void decode_flush(AVCodecContext *avctx) const FFCodec ff_ralf_decoder = { .p.name = "ralf", - .p.long_name = NULL_IF_CONFIG_SMALL("RealAudio Lossless"), + CODEC_LONG_NAME("RealAudio Lossless"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_RALF, .priv_data_size = sizeof(RALFContext), diff --git a/libavcodec/rasc.c b/libavcodec/rasc.c index a04dff6d90..cfa3d6b079 100644 --- a/libavcodec/rasc.c +++ b/libavcodec/rasc.c @@ -797,7 +797,7 @@ static const AVClass rasc_decoder_class = { const FFCodec ff_rasc_decoder = { .p.name = "rasc", - .p.long_name = NULL_IF_CONFIG_SMALL("RemotelyAnywhere Screen Capture"), + CODEC_LONG_NAME("RemotelyAnywhere Screen Capture"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_RASC, .priv_data_size = sizeof(RASCContext), diff --git a/libavcodec/rawdec.c b/libavcodec/rawdec.c index e1bb542d51..72cdd13916 100644 --- a/libavcodec/rawdec.c +++ b/libavcodec/rawdec.c @@ -482,7 +482,7 @@ static av_cold int raw_close_decoder(AVCodecContext *avctx) const FFCodec ff_rawvideo_decoder = { .p.name = "rawvideo", - .p.long_name = NULL_IF_CONFIG_SMALL("raw video"), + CODEC_LONG_NAME("raw video"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_RAWVIDEO, .priv_data_size = sizeof(RawVideoContext), diff --git a/libavcodec/rawenc.c b/libavcodec/rawenc.c index 826102efaf..c2643e6d80 100644 --- a/libavcodec/rawenc.c +++ b/libavcodec/rawenc.c @@ -83,7 +83,7 @@ static int raw_encode(AVCodecContext *avctx, AVPacket *pkt, const FFCodec ff_rawvideo_encoder = { .p.name = "rawvideo", - .p.long_name = NULL_IF_CONFIG_SMALL("raw video"), + CODEC_LONG_NAME("raw video"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_RAWVIDEO, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS, diff --git a/libavcodec/realtextdec.c b/libavcodec/realtextdec.c index f78c8229fe..b09ff78ea4 100644 --- a/libavcodec/realtextdec.c +++ b/libavcodec/realtextdec.c @@ -76,7 +76,7 @@ static int realtext_decode_frame(AVCodecContext *avctx, AVSubtitle *sub, const FFCodec ff_realtext_decoder = { .p.name = "realtext", - .p.long_name = NULL_IF_CONFIG_SMALL("RealText subtitle"), + CODEC_LONG_NAME("RealText subtitle"), .p.type = AVMEDIA_TYPE_SUBTITLE, .p.id = AV_CODEC_ID_REALTEXT, FF_CODEC_DECODE_SUB_CB(realtext_decode_frame), diff --git a/libavcodec/rkmppdec.c b/libavcodec/rkmppdec.c index 77d09739a5..8bf7c6ed16 100644 --- a/libavcodec/rkmppdec.c +++ b/libavcodec/rkmppdec.c @@ -563,7 +563,7 @@ static const AVCodecHWConfigInternal *const rkmpp_hw_configs[] = { RKMPP_DEC_CLASS(NAME) \ const FFCodec ff_##NAME##_rkmpp_decoder = { \ .p.name = #NAME "_rkmpp", \ - .p.long_name = NULL_IF_CONFIG_SMALL(#NAME " (rkmpp)"), \ + CODEC_LONG_NAME(#NAME " (rkmpp)"), \ .p.type = AVMEDIA_TYPE_VIDEO, \ .p.id = ID, \ .priv_data_size = sizeof(RKMPPDecodeContext), \ diff --git a/libavcodec/rl2.c b/libavcodec/rl2.c index 2e6f555b8c..5dedb96266 100644 --- a/libavcodec/rl2.c +++ b/libavcodec/rl2.c @@ -217,7 +217,7 @@ static av_cold int rl2_decode_end(AVCodecContext *avctx) const FFCodec ff_rl2_decoder = { .p.name = "rl2", - .p.long_name = NULL_IF_CONFIG_SMALL("RL2 video"), + CODEC_LONG_NAME("RL2 video"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_RL2, .priv_data_size = sizeof(Rl2Context), diff --git a/libavcodec/roqaudioenc.c b/libavcodec/roqaudioenc.c index e5bc902133..f0254adc70 100644 --- a/libavcodec/roqaudioenc.c +++ b/libavcodec/roqaudioenc.c @@ -189,7 +189,7 @@ static int roq_dpcm_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, const FFCodec ff_roq_dpcm_encoder = { .p.name = "roq_dpcm", - .p.long_name = NULL_IF_CONFIG_SMALL("id RoQ DPCM"), + CODEC_LONG_NAME("id RoQ DPCM"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_ROQ_DPCM, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY, diff --git a/libavcodec/roqvideodec.c b/libavcodec/roqvideodec.c index 2f7f91d41f..6f2e48d2f3 100644 --- a/libavcodec/roqvideodec.c +++ b/libavcodec/roqvideodec.c @@ -234,7 +234,7 @@ static av_cold int roq_decode_end(AVCodecContext *avctx) const FFCodec ff_roq_decoder = { .p.name = "roqvideo", - .p.long_name = NULL_IF_CONFIG_SMALL("id RoQ video"), + CODEC_LONG_NAME("id RoQ video"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_ROQ, .priv_data_size = sizeof(RoqContext), diff --git a/libavcodec/roqvideoenc.c b/libavcodec/roqvideoenc.c index 9f03107d81..273686a147 100644 --- a/libavcodec/roqvideoenc.c +++ b/libavcodec/roqvideoenc.c @@ -1119,7 +1119,7 @@ static const AVClass roq_class = { const FFCodec ff_roq_encoder = { .p.name = "roqvideo", - .p.long_name = NULL_IF_CONFIG_SMALL("id RoQ video"), + CODEC_LONG_NAME("id RoQ video"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_ROQ, .p.capabilities = AV_CODEC_CAP_DR1, diff --git a/libavcodec/rpza.c b/libavcodec/rpza.c index f9ab3a7647..cad2eaad73 100644 --- a/libavcodec/rpza.c +++ b/libavcodec/rpza.c @@ -285,7 +285,7 @@ static av_cold int rpza_decode_end(AVCodecContext *avctx) const FFCodec ff_rpza_decoder = { .p.name = "rpza", - .p.long_name = NULL_IF_CONFIG_SMALL("QuickTime video (RPZA)"), + CODEC_LONG_NAME("QuickTime video (RPZA)"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_RPZA, .priv_data_size = sizeof(RpzaContext), diff --git a/libavcodec/rpzaenc.c b/libavcodec/rpzaenc.c index e9f035c510..0084a271c6 100644 --- a/libavcodec/rpzaenc.c +++ b/libavcodec/rpzaenc.c @@ -846,7 +846,7 @@ static const AVClass rpza_class = { const FFCodec ff_rpza_encoder = { .p.name = "rpza", - .p.long_name = NULL_IF_CONFIG_SMALL("QuickTime video (RPZA)"), + CODEC_LONG_NAME("QuickTime video (RPZA)"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_RPZA, .p.capabilities = AV_CODEC_CAP_DR1, diff --git a/libavcodec/rscc.c b/libavcodec/rscc.c index e74f2defe7..61a25df382 100644 --- a/libavcodec/rscc.c +++ b/libavcodec/rscc.c @@ -363,7 +363,7 @@ end: const FFCodec ff_rscc_decoder = { .p.name = "rscc", - .p.long_name = NULL_IF_CONFIG_SMALL("innoHeim/Rsupport Screen Capture Codec"), + CODEC_LONG_NAME("innoHeim/Rsupport Screen Capture Codec"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_RSCC, .init = rscc_init, diff --git a/libavcodec/rv10.c b/libavcodec/rv10.c index d8b8900795..a45683228e 100644 --- a/libavcodec/rv10.c +++ b/libavcodec/rv10.c @@ -683,7 +683,7 @@ static int rv10_decode_frame(AVCodecContext *avctx, AVFrame *pict, const FFCodec ff_rv10_decoder = { .p.name = "rv10", - .p.long_name = NULL_IF_CONFIG_SMALL("RealVideo 1.0"), + CODEC_LONG_NAME("RealVideo 1.0"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_RV10, .priv_data_size = sizeof(RVDecContext), @@ -700,7 +700,7 @@ const FFCodec ff_rv10_decoder = { const FFCodec ff_rv20_decoder = { .p.name = "rv20", - .p.long_name = NULL_IF_CONFIG_SMALL("RealVideo 2.0"), + CODEC_LONG_NAME("RealVideo 2.0"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_RV20, .priv_data_size = sizeof(RVDecContext), diff --git a/libavcodec/rv10enc.c b/libavcodec/rv10enc.c index 71cbb8d249..d0704c5a4b 100644 --- a/libavcodec/rv10enc.c +++ b/libavcodec/rv10enc.c @@ -67,7 +67,7 @@ int ff_rv10_encode_picture_header(MpegEncContext *s, int picture_number) const FFCodec ff_rv10_encoder = { .p.name = "rv10", - .p.long_name = NULL_IF_CONFIG_SMALL("RealVideo 1.0"), + CODEC_LONG_NAME("RealVideo 1.0"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_RV10, .p.priv_class = &ff_mpv_enc_class, diff --git a/libavcodec/rv20enc.c b/libavcodec/rv20enc.c index 8978f3f8e5..a6bacacb48 100644 --- a/libavcodec/rv20enc.c +++ b/libavcodec/rv20enc.c @@ -64,7 +64,7 @@ void ff_rv20_encode_picture_header(MpegEncContext *s, int picture_number){ const FFCodec ff_rv20_encoder = { .p.name = "rv20", - .p.long_name = NULL_IF_CONFIG_SMALL("RealVideo 2.0"), + CODEC_LONG_NAME("RealVideo 2.0"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_RV20, .p.priv_class = &ff_mpv_enc_class, diff --git a/libavcodec/rv30.c b/libavcodec/rv30.c index a06e928a64..0361e75580 100644 --- a/libavcodec/rv30.c +++ b/libavcodec/rv30.c @@ -293,7 +293,7 @@ static av_cold int rv30_decode_init(AVCodecContext *avctx) const FFCodec ff_rv30_decoder = { .p.name = "rv30", - .p.long_name = NULL_IF_CONFIG_SMALL("RealVideo 3.0"), + CODEC_LONG_NAME("RealVideo 3.0"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_RV30, .priv_data_size = sizeof(RV34DecContext), diff --git a/libavcodec/rv40.c b/libavcodec/rv40.c index 1ddc04ebb3..728a04062a 100644 --- a/libavcodec/rv40.c +++ b/libavcodec/rv40.c @@ -576,7 +576,7 @@ static av_cold int rv40_decode_init(AVCodecContext *avctx) const FFCodec ff_rv40_decoder = { .p.name = "rv40", - .p.long_name = NULL_IF_CONFIG_SMALL("RealVideo 4.0"), + CODEC_LONG_NAME("RealVideo 4.0"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_RV40, .priv_data_size = sizeof(RV34DecContext), diff --git a/libavcodec/s302m.c b/libavcodec/s302m.c index 07d036e932..f1b41608f3 100644 --- a/libavcodec/s302m.c +++ b/libavcodec/s302m.c @@ -228,7 +228,7 @@ static const AVClass s302m_class = { const FFCodec ff_s302m_decoder = { .p.name = "s302m", - .p.long_name = NULL_IF_CONFIG_SMALL("SMPTE 302M"), + CODEC_LONG_NAME("SMPTE 302M"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_S302M, .p.priv_class = &s302m_class, diff --git a/libavcodec/s302menc.c b/libavcodec/s302menc.c index 123ce1302c..ad59325ec4 100644 --- a/libavcodec/s302menc.c +++ b/libavcodec/s302menc.c @@ -172,7 +172,7 @@ static int s302m_encode2_frame(AVCodecContext *avctx, AVPacket *avpkt, const FFCodec ff_s302m_encoder = { .p.name = "s302m", - .p.long_name = NULL_IF_CONFIG_SMALL("SMPTE 302M"), + CODEC_LONG_NAME("SMPTE 302M"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_S302M, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_EXPERIMENTAL | diff --git a/libavcodec/samidec.c b/libavcodec/samidec.c index d3d77cb548..e84c4bc6b8 100644 --- a/libavcodec/samidec.c +++ b/libavcodec/samidec.c @@ -182,7 +182,7 @@ static void sami_flush(AVCodecContext *avctx) const FFCodec ff_sami_decoder = { .p.name = "sami", - .p.long_name = NULL_IF_CONFIG_SMALL("SAMI subtitle"), + CODEC_LONG_NAME("SAMI subtitle"), .p.type = AVMEDIA_TYPE_SUBTITLE, .p.id = AV_CODEC_ID_SAMI, .priv_data_size = sizeof(SAMIContext), diff --git a/libavcodec/sanm.c b/libavcodec/sanm.c index aceddaf835..bec3c770ec 100644 --- a/libavcodec/sanm.c +++ b/libavcodec/sanm.c @@ -1516,7 +1516,7 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *frame, const FFCodec ff_sanm_decoder = { .p.name = "sanm", - .p.long_name = NULL_IF_CONFIG_SMALL("LucasArts SANM/Smush video"), + CODEC_LONG_NAME("LucasArts SANM/Smush video"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_SANM, .priv_data_size = sizeof(SANMVideoContext), diff --git a/libavcodec/sbcdec.c b/libavcodec/sbcdec.c index 3c955d5b96..51411eb16b 100644 --- a/libavcodec/sbcdec.c +++ b/libavcodec/sbcdec.c @@ -367,7 +367,7 @@ static int sbc_decode_frame(AVCodecContext *avctx, AVFrame *frame, const FFCodec ff_sbc_decoder = { .p.name = "sbc", - .p.long_name = NULL_IF_CONFIG_SMALL("SBC (low-complexity subband codec)"), + CODEC_LONG_NAME("SBC (low-complexity subband codec)"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_SBC, .priv_data_size = sizeof(SBCDecContext), diff --git a/libavcodec/sbcenc.c b/libavcodec/sbcenc.c index 863899c524..d7e9fb4198 100644 --- a/libavcodec/sbcenc.c +++ b/libavcodec/sbcenc.c @@ -345,7 +345,7 @@ static const AVClass sbc_class = { const FFCodec ff_sbc_encoder = { .p.name = "sbc", - .p.long_name = NULL_IF_CONFIG_SMALL("SBC (low-complexity subband codec)"), + CODEC_LONG_NAME("SBC (low-complexity subband codec)"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_SBC, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_SMALL_LAST_FRAME, diff --git a/libavcodec/scpr.c b/libavcodec/scpr.c index 3abde1c17a..5abe157a7d 100644 --- a/libavcodec/scpr.c +++ b/libavcodec/scpr.c @@ -667,7 +667,7 @@ static av_cold int decode_close(AVCodecContext *avctx) const FFCodec ff_scpr_decoder = { .p.name = "scpr", - .p.long_name = NULL_IF_CONFIG_SMALL("ScreenPressor"), + CODEC_LONG_NAME("ScreenPressor"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_SCPR, .priv_data_size = sizeof(SCPRContext), diff --git a/libavcodec/screenpresso.c b/libavcodec/screenpresso.c index a5ca32765f..0d9e485043 100644 --- a/libavcodec/screenpresso.c +++ b/libavcodec/screenpresso.c @@ -184,7 +184,7 @@ static int screenpresso_decode_frame(AVCodecContext *avctx, AVFrame *frame, const FFCodec ff_screenpresso_decoder = { .p.name = "screenpresso", - .p.long_name = NULL_IF_CONFIG_SMALL("Screenpresso"), + CODEC_LONG_NAME("Screenpresso"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_SCREENPRESSO, .init = screenpresso_init, diff --git a/libavcodec/sga.c b/libavcodec/sga.c index 296ab5dd5d..d3f4924298 100644 --- a/libavcodec/sga.c +++ b/libavcodec/sga.c @@ -521,7 +521,7 @@ static av_cold int sga_decode_end(AVCodecContext *avctx) const FFCodec ff_sga_decoder = { .p.name = "sga", - .p.long_name = NULL_IF_CONFIG_SMALL("Digital Pictures SGA Video"), + CODEC_LONG_NAME("Digital Pictures SGA Video"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_SGA_VIDEO, .priv_data_size = sizeof(SGAVideoContext), diff --git a/libavcodec/sgidec.c b/libavcodec/sgidec.c index e33a739ecd..dd3dc46b48 100644 --- a/libavcodec/sgidec.c +++ b/libavcodec/sgidec.c @@ -287,7 +287,7 @@ static av_cold int sgi_decode_init(AVCodecContext *avctx) const FFCodec ff_sgi_decoder = { .p.name = "sgi", - .p.long_name = NULL_IF_CONFIG_SMALL("SGI image"), + CODEC_LONG_NAME("SGI image"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_SGI, .priv_data_size = sizeof(SgiState), diff --git a/libavcodec/sgienc.c b/libavcodec/sgienc.c index 109dbdc1fc..901e0a74f9 100644 --- a/libavcodec/sgienc.c +++ b/libavcodec/sgienc.c @@ -272,7 +272,7 @@ static const AVClass sgi_class = { const FFCodec ff_sgi_encoder = { .p.name = "sgi", - .p.long_name = NULL_IF_CONFIG_SMALL("SGI image"), + CODEC_LONG_NAME("SGI image"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_SGI, .p.capabilities = AV_CODEC_CAP_DR1, diff --git a/libavcodec/sgirledec.c b/libavcodec/sgirledec.c index c1d1da25c4..9e3a220ad4 100644 --- a/libavcodec/sgirledec.c +++ b/libavcodec/sgirledec.c @@ -133,7 +133,7 @@ static int sgirle_decode_frame(AVCodecContext *avctx, AVFrame *frame, const FFCodec ff_sgirle_decoder = { .p.name = "sgirle", - .p.long_name = NULL_IF_CONFIG_SMALL("Silicon Graphics RLE 8-bit video"), + CODEC_LONG_NAME("Silicon Graphics RLE 8-bit video"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_SGIRLE, .init = sgirle_decode_init, diff --git a/libavcodec/sheervideo.c b/libavcodec/sheervideo.c index 327bf85eda..eee6014742 100644 --- a/libavcodec/sheervideo.c +++ b/libavcodec/sheervideo.c @@ -2000,7 +2000,7 @@ static av_cold int decode_end(AVCodecContext *avctx) const FFCodec ff_sheervideo_decoder = { .p.name = "sheervideo", - .p.long_name = NULL_IF_CONFIG_SMALL("BitJazz SheerVideo"), + CODEC_LONG_NAME("BitJazz SheerVideo"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_SHEERVIDEO, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS, diff --git a/libavcodec/shorten.c b/libavcodec/shorten.c index 02864d06ae..1b2abd76b1 100644 --- a/libavcodec/shorten.c +++ b/libavcodec/shorten.c @@ -805,7 +805,7 @@ static av_cold int shorten_decode_close(AVCodecContext *avctx) const FFCodec ff_shorten_decoder = { .p.name = "shorten", - .p.long_name = NULL_IF_CONFIG_SMALL("Shorten"), + CODEC_LONG_NAME("Shorten"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_SHORTEN, .priv_data_size = sizeof(ShortenContext), diff --git a/libavcodec/sipr.c b/libavcodec/sipr.c index d28bc760ca..692b59b3e8 100644 --- a/libavcodec/sipr.c +++ b/libavcodec/sipr.c @@ -564,7 +564,7 @@ static int sipr_decode_frame(AVCodecContext *avctx, AVFrame *frame, const FFCodec ff_sipr_decoder = { .p.name = "sipr", - .p.long_name = NULL_IF_CONFIG_SMALL("RealAudio SIPR / ACELP.NET"), + CODEC_LONG_NAME("RealAudio SIPR / ACELP.NET"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_SIPR, .priv_data_size = sizeof(SiprContext), diff --git a/libavcodec/siren.c b/libavcodec/siren.c index 8a22825615..b3627754da 100644 --- a/libavcodec/siren.c +++ b/libavcodec/siren.c @@ -842,7 +842,7 @@ static av_cold int siren_close(AVCodecContext *avctx) const FFCodec ff_siren_decoder = { .p.name = "siren", - .p.long_name = NULL_IF_CONFIG_SMALL("Siren"), + CODEC_LONG_NAME("Siren"), .priv_data_size = sizeof(SirenContext), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_SIREN, @@ -857,7 +857,7 @@ const FFCodec ff_siren_decoder = { const FFCodec ff_msnsiren_decoder = { .p.name = "msnsiren", - .p.long_name = NULL_IF_CONFIG_SMALL("MSN Siren"), + CODEC_LONG_NAME("MSN Siren"), .priv_data_size = sizeof(SirenContext), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_MSNSIREN, diff --git a/libavcodec/smacker.c b/libavcodec/smacker.c index 2b1c4aebb5..ecc27e9b67 100644 --- a/libavcodec/smacker.c +++ b/libavcodec/smacker.c @@ -742,7 +742,7 @@ error: const FFCodec ff_smacker_decoder = { .p.name = "smackvid", - .p.long_name = NULL_IF_CONFIG_SMALL("Smacker video"), + CODEC_LONG_NAME("Smacker video"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_SMACKVIDEO, .priv_data_size = sizeof(SmackVContext), @@ -755,7 +755,7 @@ const FFCodec ff_smacker_decoder = { const FFCodec ff_smackaud_decoder = { .p.name = "smackaud", - .p.long_name = NULL_IF_CONFIG_SMALL("Smacker audio"), + CODEC_LONG_NAME("Smacker audio"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_SMACKAUDIO, .init = smka_decode_init, diff --git a/libavcodec/smc.c b/libavcodec/smc.c index c4364cfe8c..e6d01791c2 100644 --- a/libavcodec/smc.c +++ b/libavcodec/smc.c @@ -466,7 +466,7 @@ static av_cold int smc_decode_end(AVCodecContext *avctx) const FFCodec ff_smc_decoder = { .p.name = "smc", - .p.long_name = NULL_IF_CONFIG_SMALL("QuickTime Graphics (SMC)"), + CODEC_LONG_NAME("QuickTime Graphics (SMC)"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_SMC, .priv_data_size = sizeof(SmcContext), diff --git a/libavcodec/smcenc.c b/libavcodec/smcenc.c index f97e06c07c..f3d26a4e8d 100644 --- a/libavcodec/smcenc.c +++ b/libavcodec/smcenc.c @@ -550,7 +550,7 @@ static int smc_encode_end(AVCodecContext *avctx) const FFCodec ff_smc_encoder = { .p.name = "smc", - .p.long_name = NULL_IF_CONFIG_SMALL("QuickTime Graphics (SMC)"), + CODEC_LONG_NAME("QuickTime Graphics (SMC)"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_SMC, .p.capabilities = AV_CODEC_CAP_DR1, diff --git a/libavcodec/snowdec.c b/libavcodec/snowdec.c index 3a7fda09eb..5c95ffde11 100644 --- a/libavcodec/snowdec.c +++ b/libavcodec/snowdec.c @@ -655,7 +655,7 @@ static av_cold int decode_end(AVCodecContext *avctx) const FFCodec ff_snow_decoder = { .p.name = "snow", - .p.long_name = NULL_IF_CONFIG_SMALL("Snow"), + CODEC_LONG_NAME("Snow"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_SNOW, .priv_data_size = sizeof(SnowContext), diff --git a/libavcodec/snowenc.c b/libavcodec/snowenc.c index 351ee0abc4..b647fc9016 100644 --- a/libavcodec/snowenc.c +++ b/libavcodec/snowenc.c @@ -1930,7 +1930,7 @@ static const AVClass snowenc_class = { const FFCodec ff_snow_encoder = { .p.name = "snow", - .p.long_name = NULL_IF_CONFIG_SMALL("Snow"), + CODEC_LONG_NAME("Snow"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_SNOW, .p.capabilities = AV_CODEC_CAP_DR1, diff --git a/libavcodec/sonic.c b/libavcodec/sonic.c index 50fd171231..77bdb418a7 100644 --- a/libavcodec/sonic.c +++ b/libavcodec/sonic.c @@ -1078,7 +1078,7 @@ static int sonic_decode_frame(AVCodecContext *avctx, AVFrame *frame, const FFCodec ff_sonic_decoder = { .p.name = "sonic", - .p.long_name = NULL_IF_CONFIG_SMALL("Sonic"), + CODEC_LONG_NAME("Sonic"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_SONIC, .priv_data_size = sizeof(SonicContext), @@ -1093,7 +1093,7 @@ const FFCodec ff_sonic_decoder = { #if CONFIG_SONIC_ENCODER const FFCodec ff_sonic_encoder = { .p.name = "sonic", - .p.long_name = NULL_IF_CONFIG_SMALL("Sonic"), + CODEC_LONG_NAME("Sonic"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_SONIC, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_EXPERIMENTAL, @@ -1109,7 +1109,7 @@ const FFCodec ff_sonic_encoder = { #if CONFIG_SONIC_LS_ENCODER const FFCodec ff_sonic_ls_encoder = { .p.name = "sonicls", - .p.long_name = NULL_IF_CONFIG_SMALL("Sonic lossless"), + CODEC_LONG_NAME("Sonic lossless"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_SONIC_LS, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_EXPERIMENTAL, diff --git a/libavcodec/sp5xdec.c b/libavcodec/sp5xdec.c index 1d8316f64c..394448c5a9 100644 --- a/libavcodec/sp5xdec.c +++ b/libavcodec/sp5xdec.c @@ -94,7 +94,7 @@ int ff_sp5x_process_packet(AVCodecContext *avctx, AVPacket *avpkt) #if CONFIG_SP5X_DECODER const FFCodec ff_sp5x_decoder = { .p.name = "sp5x", - .p.long_name = NULL_IF_CONFIG_SMALL("Sunplus JPEG (SP5X)"), + CODEC_LONG_NAME("Sunplus JPEG (SP5X)"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_SP5X, .priv_data_size = sizeof(MJpegDecodeContext), @@ -110,7 +110,7 @@ const FFCodec ff_sp5x_decoder = { #if CONFIG_AMV_DECODER const FFCodec ff_amv_decoder = { .p.name = "amv", - .p.long_name = NULL_IF_CONFIG_SMALL("AMV Video"), + CODEC_LONG_NAME("AMV Video"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_AMV, .priv_data_size = sizeof(MJpegDecodeContext), diff --git a/libavcodec/speedhq.c b/libavcodec/speedhq.c index b3b3f091d6..1661b66ae7 100644 --- a/libavcodec/speedhq.c +++ b/libavcodec/speedhq.c @@ -725,7 +725,7 @@ static av_cold int speedhq_decode_init(AVCodecContext *avctx) const FFCodec ff_speedhq_decoder = { .p.name = "speedhq", - .p.long_name = NULL_IF_CONFIG_SMALL("NewTek SpeedHQ"), + CODEC_LONG_NAME("NewTek SpeedHQ"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_SPEEDHQ, .priv_data_size = sizeof(SHQContext), diff --git a/libavcodec/speedhqenc.c b/libavcodec/speedhqenc.c index 73c70c269a..747ed679bd 100644 --- a/libavcodec/speedhqenc.c +++ b/libavcodec/speedhqenc.c @@ -279,7 +279,7 @@ int ff_speedhq_mb_y_order_to_mb(int mb_y_order, int mb_height, int *first_in_sli #if CONFIG_SPEEDHQ_ENCODER const FFCodec ff_speedhq_encoder = { .p.name = "speedhq", - .p.long_name = NULL_IF_CONFIG_SMALL("NewTek SpeedHQ"), + CODEC_LONG_NAME("NewTek SpeedHQ"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_SPEEDHQ, .p.priv_class = &ff_mpv_enc_class, diff --git a/libavcodec/speexdec.c b/libavcodec/speexdec.c index d16317ddec..83981fc454 100644 --- a/libavcodec/speexdec.c +++ b/libavcodec/speexdec.c @@ -1578,7 +1578,7 @@ static av_cold int speex_decode_close(AVCodecContext *avctx) const FFCodec ff_speex_decoder = { .p.name = "speex", - .p.long_name = NULL_IF_CONFIG_SMALL("Speex"), + CODEC_LONG_NAME("Speex"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_SPEEX, .init = speex_decode_init, diff --git a/libavcodec/srtdec.c b/libavcodec/srtdec.c index 3a1ddfc88b..8697f5b149 100644 --- a/libavcodec/srtdec.c +++ b/libavcodec/srtdec.c @@ -92,7 +92,7 @@ static int srt_decode_frame(AVCodecContext *avctx, AVSubtitle *sub, /* deprecated decoder */ const FFCodec ff_srt_decoder = { .p.name = "srt", - .p.long_name = NULL_IF_CONFIG_SMALL("SubRip subtitle"), + CODEC_LONG_NAME("SubRip subtitle"), .p.type = AVMEDIA_TYPE_SUBTITLE, .p.id = AV_CODEC_ID_SUBRIP, .init = ff_ass_subtitle_header_default, @@ -105,7 +105,7 @@ const FFCodec ff_srt_decoder = { #if CONFIG_SUBRIP_DECODER const FFCodec ff_subrip_decoder = { .p.name = "subrip", - .p.long_name = NULL_IF_CONFIG_SMALL("SubRip subtitle"), + CODEC_LONG_NAME("SubRip subtitle"), .p.type = AVMEDIA_TYPE_SUBTITLE, .p.id = AV_CODEC_ID_SUBRIP, .init = ff_ass_subtitle_header_default, diff --git a/libavcodec/srtenc.c b/libavcodec/srtenc.c index f6b2f16048..7e36a2200c 100644 --- a/libavcodec/srtenc.c +++ b/libavcodec/srtenc.c @@ -295,7 +295,7 @@ static int srt_encode_close(AVCodecContext *avctx) /* deprecated encoder */ const FFCodec ff_srt_encoder = { .p.name = "srt", - .p.long_name = NULL_IF_CONFIG_SMALL("SubRip subtitle"), + CODEC_LONG_NAME("SubRip subtitle"), .p.type = AVMEDIA_TYPE_SUBTITLE, .p.id = AV_CODEC_ID_SUBRIP, .priv_data_size = sizeof(SRTContext), @@ -308,7 +308,7 @@ const FFCodec ff_srt_encoder = { #if CONFIG_SUBRIP_ENCODER const FFCodec ff_subrip_encoder = { .p.name = "subrip", - .p.long_name = NULL_IF_CONFIG_SMALL("SubRip subtitle"), + CODEC_LONG_NAME("SubRip subtitle"), .p.type = AVMEDIA_TYPE_SUBTITLE, .p.id = AV_CODEC_ID_SUBRIP, .priv_data_size = sizeof(SRTContext), @@ -321,7 +321,7 @@ const FFCodec ff_subrip_encoder = { #if CONFIG_TEXT_ENCODER const FFCodec ff_text_encoder = { .p.name = "text", - .p.long_name = NULL_IF_CONFIG_SMALL("Raw text subtitle"), + CODEC_LONG_NAME("Raw text subtitle"), .p.type = AVMEDIA_TYPE_SUBTITLE, .p.id = AV_CODEC_ID_TEXT, .priv_data_size = sizeof(SRTContext), diff --git a/libavcodec/subviewerdec.c b/libavcodec/subviewerdec.c index 3a293b0a34..209f69505f 100644 --- a/libavcodec/subviewerdec.c +++ b/libavcodec/subviewerdec.c @@ -67,7 +67,7 @@ static int subviewer_decode_frame(AVCodecContext *avctx, AVSubtitle *sub, const FFCodec ff_subviewer_decoder = { .p.name = "subviewer", - .p.long_name = NULL_IF_CONFIG_SMALL("SubViewer subtitle"), + CODEC_LONG_NAME("SubViewer subtitle"), .p.type = AVMEDIA_TYPE_SUBTITLE, .p.id = AV_CODEC_ID_SUBVIEWER, FF_CODEC_DECODE_SUB_CB(subviewer_decode_frame), diff --git a/libavcodec/sunrast.c b/libavcodec/sunrast.c index ee648ba95d..77feef06e1 100644 --- a/libavcodec/sunrast.c +++ b/libavcodec/sunrast.c @@ -206,7 +206,7 @@ static int sunrast_decode_frame(AVCodecContext *avctx, AVFrame *p, const FFCodec ff_sunrast_decoder = { .p.name = "sunrast", - .p.long_name = NULL_IF_CONFIG_SMALL("Sun Rasterfile image"), + CODEC_LONG_NAME("Sun Rasterfile image"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_SUNRAST, .p.capabilities = AV_CODEC_CAP_DR1, diff --git a/libavcodec/sunrastenc.c b/libavcodec/sunrastenc.c index 2f0c033b46..9b82f9921a 100644 --- a/libavcodec/sunrastenc.c +++ b/libavcodec/sunrastenc.c @@ -210,7 +210,7 @@ static const AVClass sunrast_class = { const FFCodec ff_sunrast_encoder = { .p.name = "sunrast", - .p.long_name = NULL_IF_CONFIG_SMALL("Sun Rasterfile image"), + CODEC_LONG_NAME("Sun Rasterfile image"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_SUNRAST, .p.capabilities = AV_CODEC_CAP_DR1, diff --git a/libavcodec/svq1dec.c b/libavcodec/svq1dec.c index c96f65249a..828b38b93d 100644 --- a/libavcodec/svq1dec.c +++ b/libavcodec/svq1dec.c @@ -845,7 +845,7 @@ static void svq1_flush(AVCodecContext *avctx) const FFCodec ff_svq1_decoder = { .p.name = "svq1", - .p.long_name = NULL_IF_CONFIG_SMALL("Sorenson Vector Quantizer 1 / Sorenson Video 1 / SVQ1"), + CODEC_LONG_NAME("Sorenson Vector Quantizer 1 / Sorenson Video 1 / SVQ1"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_SVQ1, .priv_data_size = sizeof(SVQ1Context), diff --git a/libavcodec/svq1enc.c b/libavcodec/svq1enc.c index f92ede867c..ef6655c2f7 100644 --- a/libavcodec/svq1enc.c +++ b/libavcodec/svq1enc.c @@ -679,7 +679,7 @@ static const AVClass svq1enc_class = { const FFCodec ff_svq1_encoder = { .p.name = "svq1", - .p.long_name = NULL_IF_CONFIG_SMALL("Sorenson Vector Quantizer 1 / Sorenson Video 1 / SVQ1"), + CODEC_LONG_NAME("Sorenson Vector Quantizer 1 / Sorenson Video 1 / SVQ1"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_SVQ1, .p.capabilities = AV_CODEC_CAP_DR1, diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c index ea9842f9b4..7e8f16cc72 100644 --- a/libavcodec/svq3.c +++ b/libavcodec/svq3.c @@ -1588,7 +1588,7 @@ static av_cold int svq3_decode_end(AVCodecContext *avctx) const FFCodec ff_svq3_decoder = { .p.name = "svq3", - .p.long_name = NULL_IF_CONFIG_SMALL("Sorenson Vector Quantizer 3 / Sorenson Video 3 / SVQ3"), + CODEC_LONG_NAME("Sorenson Vector Quantizer 3 / Sorenson Video 3 / SVQ3"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_SVQ3, .priv_data_size = sizeof(SVQ3Context), diff --git a/libavcodec/takdec.c b/libavcodec/takdec.c index 6f4cc92e88..f7fb34617d 100644 --- a/libavcodec/takdec.c +++ b/libavcodec/takdec.c @@ -939,7 +939,7 @@ static av_cold int tak_decode_close(AVCodecContext *avctx) const FFCodec ff_tak_decoder = { .p.name = "tak", - .p.long_name = NULL_IF_CONFIG_SMALL("TAK (Tom's lossless Audio Kompressor)"), + CODEC_LONG_NAME("TAK (Tom's lossless Audio Kompressor)"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_TAK, .priv_data_size = sizeof(TAKDecContext), diff --git a/libavcodec/targa.c b/libavcodec/targa.c index daade89e28..07005f2be6 100644 --- a/libavcodec/targa.c +++ b/libavcodec/targa.c @@ -304,7 +304,7 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *p, const FFCodec ff_targa_decoder = { .p.name = "targa", - .p.long_name = NULL_IF_CONFIG_SMALL("Truevision Targa image"), + CODEC_LONG_NAME("Truevision Targa image"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_TARGA, .p.capabilities = AV_CODEC_CAP_DR1, diff --git a/libavcodec/targa_y216dec.c b/libavcodec/targa_y216dec.c index ab98597492..d5234c16ae 100644 --- a/libavcodec/targa_y216dec.c +++ b/libavcodec/targa_y216dec.c @@ -75,7 +75,7 @@ static int y216_decode_frame(AVCodecContext *avctx, AVFrame *pic, const FFCodec ff_targa_y216_decoder = { .p.name = "targa_y216", - .p.long_name = NULL_IF_CONFIG_SMALL("Pinnacle TARGA CineWave YUV16"), + CODEC_LONG_NAME("Pinnacle TARGA CineWave YUV16"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_TARGA_Y216, .init = y216_decode_init, diff --git a/libavcodec/targaenc.c b/libavcodec/targaenc.c index d93a698e24..bb3cb93187 100644 --- a/libavcodec/targaenc.c +++ b/libavcodec/targaenc.c @@ -204,7 +204,7 @@ static const AVClass targa_class = { const FFCodec ff_targa_encoder = { .p.name = "targa", - .p.long_name = NULL_IF_CONFIG_SMALL("Truevision Targa image"), + CODEC_LONG_NAME("Truevision Targa image"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_TARGA, .p.capabilities = AV_CODEC_CAP_DR1, diff --git a/libavcodec/tdsc.c b/libavcodec/tdsc.c index aeb1ea363e..b5ab2e171b 100644 --- a/libavcodec/tdsc.c +++ b/libavcodec/tdsc.c @@ -623,7 +623,7 @@ static int tdsc_decode_frame(AVCodecContext *avctx, AVFrame *frame, const FFCodec ff_tdsc_decoder = { .p.name = "tdsc", - .p.long_name = NULL_IF_CONFIG_SMALL("TDSC"), + CODEC_LONG_NAME("TDSC"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_TDSC, .init = tdsc_init, diff --git a/libavcodec/textdec.c b/libavcodec/textdec.c index 4856ecdde3..b9aebff002 100644 --- a/libavcodec/textdec.c +++ b/libavcodec/textdec.c @@ -82,7 +82,7 @@ static const AVClass textsub_decoder_class = { #if CONFIG_TEXT_DECODER const FFCodec ff_text_decoder = { .p.name = "text", - .p.long_name = NULL_IF_CONFIG_SMALL("Raw text subtitle"), + CODEC_LONG_NAME("Raw text subtitle"), .priv_data_size = sizeof(TextContext), .p.type = AVMEDIA_TYPE_SUBTITLE, .p.id = AV_CODEC_ID_TEXT, @@ -105,7 +105,7 @@ static int linebreak_init(AVCodecContext *avctx) #if CONFIG_VPLAYER_DECODER const FFCodec ff_vplayer_decoder = { .p.name = "vplayer", - .p.long_name = NULL_IF_CONFIG_SMALL("VPlayer subtitle"), + CODEC_LONG_NAME("VPlayer subtitle"), .priv_data_size = sizeof(TextContext), .p.type = AVMEDIA_TYPE_SUBTITLE, .p.id = AV_CODEC_ID_VPLAYER, @@ -119,7 +119,7 @@ const FFCodec ff_vplayer_decoder = { #if CONFIG_STL_DECODER const FFCodec ff_stl_decoder = { .p.name = "stl", - .p.long_name = NULL_IF_CONFIG_SMALL("Spruce subtitle format"), + CODEC_LONG_NAME("Spruce subtitle format"), .priv_data_size = sizeof(TextContext), .p.type = AVMEDIA_TYPE_SUBTITLE, .p.id = AV_CODEC_ID_STL, @@ -133,7 +133,7 @@ const FFCodec ff_stl_decoder = { #if CONFIG_PJS_DECODER const FFCodec ff_pjs_decoder = { .p.name = "pjs", - .p.long_name = NULL_IF_CONFIG_SMALL("PJS subtitle"), + CODEC_LONG_NAME("PJS subtitle"), .priv_data_size = sizeof(TextContext), .p.type = AVMEDIA_TYPE_SUBTITLE, .p.id = AV_CODEC_ID_PJS, @@ -147,7 +147,7 @@ const FFCodec ff_pjs_decoder = { #if CONFIG_SUBVIEWER1_DECODER const FFCodec ff_subviewer1_decoder = { .p.name = "subviewer1", - .p.long_name = NULL_IF_CONFIG_SMALL("SubViewer1 subtitle"), + CODEC_LONG_NAME("SubViewer1 subtitle"), .priv_data_size = sizeof(TextContext), .p.type = AVMEDIA_TYPE_SUBTITLE, .p.id = AV_CODEC_ID_SUBVIEWER1, diff --git a/libavcodec/tiertexseqv.c b/libavcodec/tiertexseqv.c index 785ccfbdcf..19c0671bf6 100644 --- a/libavcodec/tiertexseqv.c +++ b/libavcodec/tiertexseqv.c @@ -263,7 +263,7 @@ static av_cold int seqvideo_decode_end(AVCodecContext *avctx) const FFCodec ff_tiertexseqvideo_decoder = { .p.name = "tiertexseqvideo", - .p.long_name = NULL_IF_CONFIG_SMALL("Tiertex Limited SEQ video"), + CODEC_LONG_NAME("Tiertex Limited SEQ video"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_TIERTEXSEQVIDEO, .priv_data_size = sizeof(SeqVideoContext), diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c index 109392ad44..beb427e007 100644 --- a/libavcodec/tiff.c +++ b/libavcodec/tiff.c @@ -2182,7 +2182,7 @@ static const AVClass tiff_decoder_class = { const FFCodec ff_tiff_decoder = { .p.name = "tiff", - .p.long_name = NULL_IF_CONFIG_SMALL("TIFF image"), + CODEC_LONG_NAME("TIFF image"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_TIFF, .priv_data_size = sizeof(TiffContext), diff --git a/libavcodec/tiffenc.c b/libavcodec/tiffenc.c index 2dc31345d4..6dfbdaeb40 100644 --- a/libavcodec/tiffenc.c +++ b/libavcodec/tiffenc.c @@ -571,7 +571,7 @@ static const AVClass tiffenc_class = { const FFCodec ff_tiff_encoder = { .p.name = "tiff", - .p.long_name = NULL_IF_CONFIG_SMALL("TIFF image"), + CODEC_LONG_NAME("TIFF image"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_TIFF, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS, diff --git a/libavcodec/tmv.c b/libavcodec/tmv.c index fff3806e04..cdb83452e5 100644 --- a/libavcodec/tmv.c +++ b/libavcodec/tmv.c @@ -88,7 +88,7 @@ static av_cold int tmv_decode_init(AVCodecContext *avctx) const FFCodec ff_tmv_decoder = { .p.name = "tmv", - .p.long_name = NULL_IF_CONFIG_SMALL("8088flex TMV"), + CODEC_LONG_NAME("8088flex TMV"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_TMV, .init = tmv_decode_init, diff --git a/libavcodec/truemotion1.c b/libavcodec/truemotion1.c index ab632e99dc..6b0ee22569 100644 --- a/libavcodec/truemotion1.c +++ b/libavcodec/truemotion1.c @@ -912,7 +912,7 @@ static av_cold int truemotion1_decode_end(AVCodecContext *avctx) const FFCodec ff_truemotion1_decoder = { .p.name = "truemotion1", - .p.long_name = NULL_IF_CONFIG_SMALL("Duck TrueMotion 1.0"), + CODEC_LONG_NAME("Duck TrueMotion 1.0"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_TRUEMOTION1, .priv_data_size = sizeof(TrueMotion1Context), diff --git a/libavcodec/truemotion2.c b/libavcodec/truemotion2.c index 3784733bee..b168b9cda1 100644 --- a/libavcodec/truemotion2.c +++ b/libavcodec/truemotion2.c @@ -1010,7 +1010,7 @@ static av_cold int decode_end(AVCodecContext *avctx) const FFCodec ff_truemotion2_decoder = { .p.name = "truemotion2", - .p.long_name = NULL_IF_CONFIG_SMALL("Duck TrueMotion 2.0"), + CODEC_LONG_NAME("Duck TrueMotion 2.0"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_TRUEMOTION2, .priv_data_size = sizeof(TM2Context), diff --git a/libavcodec/truemotion2rt.c b/libavcodec/truemotion2rt.c index a0bf4749f3..c6015b278a 100644 --- a/libavcodec/truemotion2rt.c +++ b/libavcodec/truemotion2rt.c @@ -216,7 +216,7 @@ static av_cold int truemotion2rt_decode_init(AVCodecContext *avctx) const FFCodec ff_truemotion2rt_decoder = { .p.name = "truemotion2rt", - .p.long_name = NULL_IF_CONFIG_SMALL("Duck TrueMotion 2.0 Real Time"), + CODEC_LONG_NAME("Duck TrueMotion 2.0 Real Time"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_TRUEMOTION2RT, .priv_data_size = sizeof(TrueMotion2RTContext), diff --git a/libavcodec/truespeech.c b/libavcodec/truespeech.c index 2493a944cf..454121cc75 100644 --- a/libavcodec/truespeech.c +++ b/libavcodec/truespeech.c @@ -357,7 +357,7 @@ static int truespeech_decode_frame(AVCodecContext *avctx, AVFrame *frame, const FFCodec ff_truespeech_decoder = { .p.name = "truespeech", - .p.long_name = NULL_IF_CONFIG_SMALL("DSP Group TrueSpeech"), + CODEC_LONG_NAME("DSP Group TrueSpeech"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_TRUESPEECH, .priv_data_size = sizeof(TSContext), diff --git a/libavcodec/tscc.c b/libavcodec/tscc.c index 89c4413647..0ebe641ab1 100644 --- a/libavcodec/tscc.c +++ b/libavcodec/tscc.c @@ -168,7 +168,7 @@ static av_cold int decode_end(AVCodecContext *avctx) const FFCodec ff_tscc_decoder = { .p.name = "camtasia", - .p.long_name = NULL_IF_CONFIG_SMALL("TechSmith Screen Capture Codec"), + CODEC_LONG_NAME("TechSmith Screen Capture Codec"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_TSCC, .priv_data_size = sizeof(CamtasiaContext), diff --git a/libavcodec/tscc2.c b/libavcodec/tscc2.c index ba84a07da7..6e4fe503c1 100644 --- a/libavcodec/tscc2.c +++ b/libavcodec/tscc2.c @@ -358,7 +358,7 @@ static av_cold int tscc2_decode_init(AVCodecContext *avctx) const FFCodec ff_tscc2_decoder = { .p.name = "tscc2", - .p.long_name = NULL_IF_CONFIG_SMALL("TechSmith Screen Codec 2"), + CODEC_LONG_NAME("TechSmith Screen Codec 2"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_TSCC2, .priv_data_size = sizeof(TSCC2Context), diff --git a/libavcodec/tta.c b/libavcodec/tta.c index 4bc6016977..6fb8d7a74f 100644 --- a/libavcodec/tta.c +++ b/libavcodec/tta.c @@ -422,7 +422,7 @@ static const AVClass tta_decoder_class = { const FFCodec ff_tta_decoder = { .p.name = "tta", - .p.long_name = NULL_IF_CONFIG_SMALL("TTA (True Audio)"), + CODEC_LONG_NAME("TTA (True Audio)"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_TTA, .priv_data_size = sizeof(TTAContext), diff --git a/libavcodec/ttaenc.c b/libavcodec/ttaenc.c index 20a711ede6..d41d2e6fa5 100644 --- a/libavcodec/ttaenc.c +++ b/libavcodec/ttaenc.c @@ -201,7 +201,7 @@ static av_cold int tta_encode_close(AVCodecContext *avctx) const FFCodec ff_tta_encoder = { .p.name = "tta", - .p.long_name = NULL_IF_CONFIG_SMALL("TTA (True Audio)"), + CODEC_LONG_NAME("TTA (True Audio)"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_TTA, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_SMALL_LAST_FRAME, diff --git a/libavcodec/ttmlenc.c b/libavcodec/ttmlenc.c index 7a09c8fb5e..fb05c38968 100644 --- a/libavcodec/ttmlenc.c +++ b/libavcodec/ttmlenc.c @@ -385,7 +385,7 @@ static av_cold int ttml_encode_init(AVCodecContext *avctx) const FFCodec ff_ttml_encoder = { .p.name = "ttml", - .p.long_name = NULL_IF_CONFIG_SMALL("TTML subtitle"), + CODEC_LONG_NAME("TTML subtitle"), .p.type = AVMEDIA_TYPE_SUBTITLE, .p.id = AV_CODEC_ID_TTML, .priv_data_size = sizeof(TTMLContext), diff --git a/libavcodec/twinvqdec.c b/libavcodec/twinvqdec.c index 7732957850..9e4587f2bc 100644 --- a/libavcodec/twinvqdec.c +++ b/libavcodec/twinvqdec.c @@ -416,7 +416,7 @@ static av_cold int twinvq_decode_init(AVCodecContext *avctx) const FFCodec ff_twinvq_decoder = { .p.name = "twinvq", - .p.long_name = NULL_IF_CONFIG_SMALL("VQF TwinVQ"), + CODEC_LONG_NAME("VQF TwinVQ"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_TWINVQ, .priv_data_size = sizeof(TwinVQContext), diff --git a/libavcodec/txd.c b/libavcodec/txd.c index 7e8b33646b..d71e788e7d 100644 --- a/libavcodec/txd.c +++ b/libavcodec/txd.c @@ -164,7 +164,7 @@ unsupported: const FFCodec ff_txd_decoder = { .p.name = "txd", - .p.long_name = NULL_IF_CONFIG_SMALL("Renderware TXD (TeXture Dictionary) image"), + CODEC_LONG_NAME("Renderware TXD (TeXture Dictionary) image"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_TXD, .p.capabilities = AV_CODEC_CAP_DR1, diff --git a/libavcodec/ulti.c b/libavcodec/ulti.c index a3abec3d5a..c5652c6889 100644 --- a/libavcodec/ulti.c +++ b/libavcodec/ulti.c @@ -416,7 +416,7 @@ err: const FFCodec ff_ulti_decoder = { .p.name = "ultimotion", - .p.long_name = NULL_IF_CONFIG_SMALL("IBM UltiMotion"), + CODEC_LONG_NAME("IBM UltiMotion"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_ULTI, .priv_data_size = sizeof(UltimotionDecodeContext), diff --git a/libavcodec/utvideodec.c b/libavcodec/utvideodec.c index fd16c3f59b..83120d1b22 100644 --- a/libavcodec/utvideodec.c +++ b/libavcodec/utvideodec.c @@ -1052,7 +1052,7 @@ static av_cold int decode_end(AVCodecContext *avctx) const FFCodec ff_utvideo_decoder = { .p.name = "utvideo", - .p.long_name = NULL_IF_CONFIG_SMALL("Ut Video"), + CODEC_LONG_NAME("Ut Video"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_UTVIDEO, .priv_data_size = sizeof(UtvideoContext), diff --git a/libavcodec/utvideoenc.c b/libavcodec/utvideoenc.c index 191d271ca2..d4388da8ba 100644 --- a/libavcodec/utvideoenc.c +++ b/libavcodec/utvideoenc.c @@ -645,7 +645,7 @@ static const AVClass utvideo_class = { const FFCodec ff_utvideo_encoder = { .p.name = "utvideo", - .p.long_name = NULL_IF_CONFIG_SMALL("Ut Video"), + CODEC_LONG_NAME("Ut Video"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_UTVIDEO, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS, diff --git a/libavcodec/v210dec.c b/libavcodec/v210dec.c index f5463799c4..43b92f6ec9 100644 --- a/libavcodec/v210dec.c +++ b/libavcodec/v210dec.c @@ -233,7 +233,7 @@ static const AVClass v210dec_class = { const FFCodec ff_v210_decoder = { .p.name = "v210", - .p.long_name = NULL_IF_CONFIG_SMALL("Uncompressed 4:2:2 10-bit"), + CODEC_LONG_NAME("Uncompressed 4:2:2 10-bit"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_V210, .priv_data_size = sizeof(V210DecContext), diff --git a/libavcodec/v210enc.c b/libavcodec/v210enc.c index f466df8c60..abbbf4ff9d 100644 --- a/libavcodec/v210enc.c +++ b/libavcodec/v210enc.c @@ -109,7 +109,7 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, const FFCodec ff_v210_encoder = { .p.name = "v210", - .p.long_name = NULL_IF_CONFIG_SMALL("Uncompressed 4:2:2 10-bit"), + CODEC_LONG_NAME("Uncompressed 4:2:2 10-bit"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_V210, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS, diff --git a/libavcodec/v210x.c b/libavcodec/v210x.c index dc188eb8a3..96594e2a43 100644 --- a/libavcodec/v210x.c +++ b/libavcodec/v210x.c @@ -121,7 +121,7 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *pic, const FFCodec ff_v210x_decoder = { .p.name = "v210x", - .p.long_name = NULL_IF_CONFIG_SMALL("Uncompressed 4:2:2 10-bit"), + CODEC_LONG_NAME("Uncompressed 4:2:2 10-bit"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_V210X, .init = decode_init, diff --git a/libavcodec/v308dec.c b/libavcodec/v308dec.c index ee9d723dd6..a81771fc5f 100644 --- a/libavcodec/v308dec.c +++ b/libavcodec/v308dec.c @@ -74,7 +74,7 @@ static int v308_decode_frame(AVCodecContext *avctx, AVFrame *pic, const FFCodec ff_v308_decoder = { .p.name = "v308", - .p.long_name = NULL_IF_CONFIG_SMALL("Uncompressed packed 4:4:4"), + CODEC_LONG_NAME("Uncompressed packed 4:4:4"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_V308, .init = v308_decode_init, diff --git a/libavcodec/v308enc.c b/libavcodec/v308enc.c index c6a270a883..78e33c0a8a 100644 --- a/libavcodec/v308enc.c +++ b/libavcodec/v308enc.c @@ -72,7 +72,7 @@ static int v308_encode_frame(AVCodecContext *avctx, AVPacket *pkt, const FFCodec ff_v308_encoder = { .p.name = "v308", - .p.long_name = NULL_IF_CONFIG_SMALL("Uncompressed packed 4:4:4"), + CODEC_LONG_NAME("Uncompressed packed 4:4:4"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_V308, .p.capabilities = AV_CODEC_CAP_DR1, diff --git a/libavcodec/v408dec.c b/libavcodec/v408dec.c index 0c1d0244d0..edc9976d94 100644 --- a/libavcodec/v408dec.c +++ b/libavcodec/v408dec.c @@ -92,7 +92,7 @@ static int v408_decode_frame(AVCodecContext *avctx, AVFrame *pic, #if CONFIG_AYUV_DECODER const FFCodec ff_ayuv_decoder = { .p.name = "ayuv", - .p.long_name = NULL_IF_CONFIG_SMALL("Uncompressed packed MS 4:4:4:4"), + CODEC_LONG_NAME("Uncompressed packed MS 4:4:4:4"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_AYUV, .init = v408_decode_init, @@ -104,7 +104,7 @@ const FFCodec ff_ayuv_decoder = { #if CONFIG_V408_DECODER const FFCodec ff_v408_decoder = { .p.name = "v408", - .p.long_name = NULL_IF_CONFIG_SMALL("Uncompressed packed QT 4:4:4:4"), + CODEC_LONG_NAME("Uncompressed packed QT 4:4:4:4"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_V408, .init = v408_decode_init, diff --git a/libavcodec/v408enc.c b/libavcodec/v408enc.c index 7ab59792e6..514f41be4e 100644 --- a/libavcodec/v408enc.c +++ b/libavcodec/v408enc.c @@ -91,7 +91,7 @@ static const enum AVPixelFormat pix_fmt[] = { AV_PIX_FMT_YUVA444P, AV_PIX_FMT_NO #if CONFIG_AYUV_ENCODER const FFCodec ff_ayuv_encoder = { .p.name = "ayuv", - .p.long_name = NULL_IF_CONFIG_SMALL("Uncompressed packed MS 4:4:4:4"), + CODEC_LONG_NAME("Uncompressed packed MS 4:4:4:4"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_AYUV, .p.capabilities = AV_CODEC_CAP_DR1, @@ -104,7 +104,7 @@ const FFCodec ff_ayuv_encoder = { #if CONFIG_V408_ENCODER const FFCodec ff_v408_encoder = { .p.name = "v408", - .p.long_name = NULL_IF_CONFIG_SMALL("Uncompressed packed QT 4:4:4:4"), + CODEC_LONG_NAME("Uncompressed packed QT 4:4:4:4"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_V408, .p.capabilities = AV_CODEC_CAP_DR1, diff --git a/libavcodec/v410dec.c b/libavcodec/v410dec.c index 4844e123d9..fb859e8cca 100644 --- a/libavcodec/v410dec.c +++ b/libavcodec/v410dec.c @@ -116,7 +116,7 @@ static int v410_decode_frame(AVCodecContext *avctx, AVFrame *pic, const FFCodec ff_v410_decoder = { .p.name = "v410", - .p.long_name = NULL_IF_CONFIG_SMALL("Uncompressed 4:4:4 10-bit"), + CODEC_LONG_NAME("Uncompressed 4:4:4 10-bit"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_V410, .init = v410_decode_init, diff --git a/libavcodec/v410enc.c b/libavcodec/v410enc.c index f08ccb2147..bad13c371a 100644 --- a/libavcodec/v410enc.c +++ b/libavcodec/v410enc.c @@ -76,7 +76,7 @@ static int v410_encode_frame(AVCodecContext *avctx, AVPacket *pkt, const FFCodec ff_v410_encoder = { .p.name = "v410", - .p.long_name = NULL_IF_CONFIG_SMALL("Uncompressed 4:4:4 10-bit"), + CODEC_LONG_NAME("Uncompressed 4:4:4 10-bit"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_V410, .p.capabilities = AV_CODEC_CAP_DR1, diff --git a/libavcodec/v4l2_m2m_dec.c b/libavcodec/v4l2_m2m_dec.c index 81729e256c..53a57eaeb8 100644 --- a/libavcodec/v4l2_m2m_dec.c +++ b/libavcodec/v4l2_m2m_dec.c @@ -242,7 +242,7 @@ static const AVOption options[] = { M2MDEC_CLASS(NAME) \ const FFCodec ff_ ## NAME ## _v4l2m2m_decoder = { \ .p.name = #NAME "_v4l2m2m" , \ - .p.long_name = NULL_IF_CONFIG_SMALL("V4L2 mem2mem " LONGNAME " decoder wrapper"), \ + CODEC_LONG_NAME("V4L2 mem2mem " LONGNAME " decoder wrapper"), \ .p.type = AVMEDIA_TYPE_VIDEO, \ .p.id = CODEC , \ .priv_data_size = sizeof(V4L2m2mPriv), \ diff --git a/libavcodec/v4l2_m2m_enc.c b/libavcodec/v4l2_m2m_enc.c index 03425673ea..9a0837ecf3 100644 --- a/libavcodec/v4l2_m2m_enc.c +++ b/libavcodec/v4l2_m2m_enc.c @@ -423,7 +423,7 @@ static const FFCodecDefault v4l2_m2m_defaults[] = { M2MENC_CLASS(NAME, OPTIONS_NAME) \ const FFCodec ff_ ## NAME ## _v4l2m2m_encoder = { \ .p.name = #NAME "_v4l2m2m" , \ - .p.long_name = NULL_IF_CONFIG_SMALL("V4L2 mem2mem " LONGNAME " encoder wrapper"), \ + CODEC_LONG_NAME("V4L2 mem2mem " LONGNAME " encoder wrapper"), \ .p.type = AVMEDIA_TYPE_VIDEO, \ .p.id = CODEC , \ .priv_data_size = sizeof(V4L2m2mPriv), \ diff --git a/libavcodec/vaapi_encode_h264.c b/libavcodec/vaapi_encode_h264.c index f1f6694f3b..b1b503b2a6 100644 --- a/libavcodec/vaapi_encode_h264.c +++ b/libavcodec/vaapi_encode_h264.c @@ -1327,7 +1327,7 @@ static const AVClass vaapi_encode_h264_class = { const FFCodec ff_h264_vaapi_encoder = { .p.name = "h264_vaapi", - .p.long_name = NULL_IF_CONFIG_SMALL("H.264/AVC (VAAPI)"), + CODEC_LONG_NAME("H.264/AVC (VAAPI)"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_H264, .priv_data_size = sizeof(VAAPIEncodeH264Context), diff --git a/libavcodec/vaapi_encode_h265.c b/libavcodec/vaapi_encode_h265.c index 967d71e998..875c18343e 100644 --- a/libavcodec/vaapi_encode_h265.c +++ b/libavcodec/vaapi_encode_h265.c @@ -1447,7 +1447,7 @@ static const AVClass vaapi_encode_h265_class = { const FFCodec ff_hevc_vaapi_encoder = { .p.name = "hevc_vaapi", - .p.long_name = NULL_IF_CONFIG_SMALL("H.265/HEVC (VAAPI)"), + CODEC_LONG_NAME("H.265/HEVC (VAAPI)"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_HEVC, .priv_data_size = sizeof(VAAPIEncodeH265Context), diff --git a/libavcodec/vaapi_encode_mjpeg.c b/libavcodec/vaapi_encode_mjpeg.c index cf1497a440..5ef93cd102 100644 --- a/libavcodec/vaapi_encode_mjpeg.c +++ b/libavcodec/vaapi_encode_mjpeg.c @@ -566,7 +566,7 @@ static const AVClass vaapi_encode_mjpeg_class = { const FFCodec ff_mjpeg_vaapi_encoder = { .p.name = "mjpeg_vaapi", - .p.long_name = NULL_IF_CONFIG_SMALL("MJPEG (VAAPI)"), + CODEC_LONG_NAME("MJPEG (VAAPI)"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_MJPEG, .priv_data_size = sizeof(VAAPIEncodeMJPEGContext), diff --git a/libavcodec/vaapi_encode_mpeg2.c b/libavcodec/vaapi_encode_mpeg2.c index f592043f37..38e1d83f68 100644 --- a/libavcodec/vaapi_encode_mpeg2.c +++ b/libavcodec/vaapi_encode_mpeg2.c @@ -689,7 +689,7 @@ static const AVClass vaapi_encode_mpeg2_class = { const FFCodec ff_mpeg2_vaapi_encoder = { .p.name = "mpeg2_vaapi", - .p.long_name = NULL_IF_CONFIG_SMALL("MPEG-2 (VAAPI)"), + CODEC_LONG_NAME("MPEG-2 (VAAPI)"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_MPEG2VIDEO, .priv_data_size = sizeof(VAAPIEncodeMPEG2Context), diff --git a/libavcodec/vaapi_encode_vp8.c b/libavcodec/vaapi_encode_vp8.c index 1cb2446c88..93e543d798 100644 --- a/libavcodec/vaapi_encode_vp8.c +++ b/libavcodec/vaapi_encode_vp8.c @@ -244,7 +244,7 @@ static const AVClass vaapi_encode_vp8_class = { const FFCodec ff_vp8_vaapi_encoder = { .p.name = "vp8_vaapi", - .p.long_name = NULL_IF_CONFIG_SMALL("VP8 (VAAPI)"), + CODEC_LONG_NAME("VP8 (VAAPI)"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_VP8, .priv_data_size = sizeof(VAAPIEncodeVP8Context), diff --git a/libavcodec/vaapi_encode_vp9.c b/libavcodec/vaapi_encode_vp9.c index 9530b2f462..ea824a31d1 100644 --- a/libavcodec/vaapi_encode_vp9.c +++ b/libavcodec/vaapi_encode_vp9.c @@ -298,7 +298,7 @@ static const AVClass vaapi_encode_vp9_class = { const FFCodec ff_vp9_vaapi_encoder = { .p.name = "vp9_vaapi", - .p.long_name = NULL_IF_CONFIG_SMALL("VP9 (VAAPI)"), + CODEC_LONG_NAME("VP9 (VAAPI)"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_VP9, .priv_data_size = sizeof(VAAPIEncodeVP9Context), diff --git a/libavcodec/vb.c b/libavcodec/vb.c index 9024f0947c..8b0e216473 100644 --- a/libavcodec/vb.c +++ b/libavcodec/vb.c @@ -277,7 +277,7 @@ static av_cold int decode_end(AVCodecContext *avctx) const FFCodec ff_vb_decoder = { .p.name = "vb", - .p.long_name = NULL_IF_CONFIG_SMALL("Beam Software VB"), + CODEC_LONG_NAME("Beam Software VB"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_VB, .priv_data_size = sizeof(VBDecContext), diff --git a/libavcodec/vble.c b/libavcodec/vble.c index 48a0c1371b..9307b0d165 100644 --- a/libavcodec/vble.c +++ b/libavcodec/vble.c @@ -203,7 +203,7 @@ static av_cold int vble_decode_init(AVCodecContext *avctx) const FFCodec ff_vble_decoder = { .p.name = "vble", - .p.long_name = NULL_IF_CONFIG_SMALL("VBLE Lossless Codec"), + CODEC_LONG_NAME("VBLE Lossless Codec"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_VBLE, .priv_data_size = sizeof(VBLEContext), diff --git a/libavcodec/vbndec.c b/libavcodec/vbndec.c index d8a3c61c8c..d92dcd46b9 100644 --- a/libavcodec/vbndec.c +++ b/libavcodec/vbndec.c @@ -175,7 +175,7 @@ out: const FFCodec ff_vbn_decoder = { .p.name = "vbn", - .p.long_name = NULL_IF_CONFIG_SMALL("Vizrt Binary Image"), + CODEC_LONG_NAME("Vizrt Binary Image"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_VBN, .init = vbn_init, diff --git a/libavcodec/vbnenc.c b/libavcodec/vbnenc.c index c93b4e37be..45101382a3 100644 --- a/libavcodec/vbnenc.c +++ b/libavcodec/vbnenc.c @@ -150,7 +150,7 @@ static const AVClass vbnenc_class = { const FFCodec ff_vbn_encoder = { .p.name = "vbn", - .p.long_name = NULL_IF_CONFIG_SMALL("Vizrt Binary Image"), + CODEC_LONG_NAME("Vizrt Binary Image"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_VBN, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_SLICE_THREADS, diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index 60e86acfd9..9f32e82f9e 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -1203,7 +1203,7 @@ static const enum AVPixelFormat vc1_hwaccel_pixfmt_list_420[] = { const FFCodec ff_vc1_decoder = { .p.name = "vc1", - .p.long_name = NULL_IF_CONFIG_SMALL("SMPTE VC-1"), + CODEC_LONG_NAME("SMPTE VC-1"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_VC1, .priv_data_size = sizeof(VC1Context), @@ -1240,7 +1240,7 @@ const FFCodec ff_vc1_decoder = { #if CONFIG_WMV3_DECODER const FFCodec ff_wmv3_decoder = { .p.name = "wmv3", - .p.long_name = NULL_IF_CONFIG_SMALL("Windows Media Video 9"), + CODEC_LONG_NAME("Windows Media Video 9"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_WMV3, .priv_data_size = sizeof(VC1Context), @@ -1278,7 +1278,7 @@ const FFCodec ff_wmv3_decoder = { #if CONFIG_WMV3IMAGE_DECODER const FFCodec ff_wmv3image_decoder = { .p.name = "wmv3image", - .p.long_name = NULL_IF_CONFIG_SMALL("Windows Media Video 9 Image"), + CODEC_LONG_NAME("Windows Media Video 9 Image"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_WMV3IMAGE, .priv_data_size = sizeof(VC1Context), @@ -1297,7 +1297,7 @@ const FFCodec ff_wmv3image_decoder = { #if CONFIG_VC1IMAGE_DECODER const FFCodec ff_vc1image_decoder = { .p.name = "vc1image", - .p.long_name = NULL_IF_CONFIG_SMALL("Windows Media Video 9 Image v2"), + CODEC_LONG_NAME("Windows Media Video 9 Image v2"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_VC1IMAGE, .priv_data_size = sizeof(VC1Context), diff --git a/libavcodec/vc2enc.c b/libavcodec/vc2enc.c index e1fd5fa608..5cb6e0d198 100644 --- a/libavcodec/vc2enc.c +++ b/libavcodec/vc2enc.c @@ -1226,7 +1226,7 @@ static const enum AVPixelFormat allowed_pix_fmts[] = { const FFCodec ff_vc2_encoder = { .p.name = "vc2", - .p.long_name = NULL_IF_CONFIG_SMALL("SMPTE VC-2"), + CODEC_LONG_NAME("SMPTE VC-2"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_DIRAC, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_SLICE_THREADS, diff --git a/libavcodec/vcr1.c b/libavcodec/vcr1.c index a97412fe7d..853d4459a8 100644 --- a/libavcodec/vcr1.c +++ b/libavcodec/vcr1.c @@ -123,7 +123,7 @@ static int vcr1_decode_frame(AVCodecContext *avctx, AVFrame *p, const FFCodec ff_vcr1_decoder = { .p.name = "vcr1", - .p.long_name = NULL_IF_CONFIG_SMALL("ATI VCR1"), + CODEC_LONG_NAME("ATI VCR1"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_VCR1, .priv_data_size = sizeof(VCR1Context), diff --git a/libavcodec/videotoolboxenc.c b/libavcodec/videotoolboxenc.c index 9de86cc4d9..bb3065d1d5 100644 --- a/libavcodec/videotoolboxenc.c +++ b/libavcodec/videotoolboxenc.c @@ -2759,7 +2759,7 @@ static const AVClass h264_videotoolbox_class = { const FFCodec ff_h264_videotoolbox_encoder = { .p.name = "h264_videotoolbox", - .p.long_name = NULL_IF_CONFIG_SMALL("VideoToolbox H.264 Encoder"), + CODEC_LONG_NAME("VideoToolbox H.264 Encoder"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_H264, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY, @@ -2794,7 +2794,7 @@ static const AVClass hevc_videotoolbox_class = { const FFCodec ff_hevc_videotoolbox_encoder = { .p.name = "hevc_videotoolbox", - .p.long_name = NULL_IF_CONFIG_SMALL("VideoToolbox H.265 Encoder"), + CODEC_LONG_NAME("VideoToolbox H.265 Encoder"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_HEVC, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY | @@ -2832,7 +2832,7 @@ static const AVClass prores_videotoolbox_class = { const FFCodec ff_prores_videotoolbox_encoder = { .p.name = "prores_videotoolbox", - .p.long_name = NULL_IF_CONFIG_SMALL("VideoToolbox ProRes Encoder"), + CODEC_LONG_NAME("VideoToolbox ProRes Encoder"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_PRORES, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY | diff --git a/libavcodec/vima.c b/libavcodec/vima.c index 0ccf2dd877..56cc1b7a85 100644 --- a/libavcodec/vima.c +++ b/libavcodec/vima.c @@ -209,7 +209,7 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *frame, const FFCodec ff_adpcm_vima_decoder = { .p.name = "adpcm_vima", - .p.long_name = NULL_IF_CONFIG_SMALL("LucasArts VIMA audio"), + CODEC_LONG_NAME("LucasArts VIMA audio"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_ADPCM_VIMA, .init = decode_init, diff --git a/libavcodec/vmdaudio.c b/libavcodec/vmdaudio.c index 158b02f6d9..7e4477ef75 100644 --- a/libavcodec/vmdaudio.c +++ b/libavcodec/vmdaudio.c @@ -230,7 +230,7 @@ static int vmdaudio_decode_frame(AVCodecContext *avctx, AVFrame *frame, const FFCodec ff_vmdaudio_decoder = { .p.name = "vmdaudio", - .p.long_name = NULL_IF_CONFIG_SMALL("Sierra VMD audio"), + CODEC_LONG_NAME("Sierra VMD audio"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_VMDAUDIO, .priv_data_size = sizeof(VmdAudioContext), diff --git a/libavcodec/vmdvideo.c b/libavcodec/vmdvideo.c index 3e530e6ee5..226ae0d316 100644 --- a/libavcodec/vmdvideo.c +++ b/libavcodec/vmdvideo.c @@ -466,7 +466,7 @@ static int vmdvideo_decode_frame(AVCodecContext *avctx, AVFrame *frame, const FFCodec ff_vmdvideo_decoder = { .p.name = "vmdvideo", - .p.long_name = NULL_IF_CONFIG_SMALL("Sierra VMD video"), + CODEC_LONG_NAME("Sierra VMD video"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_VMDVIDEO, .priv_data_size = sizeof(VmdVideoContext), diff --git a/libavcodec/vmnc.c b/libavcodec/vmnc.c index 2d47f8ec0f..8daaf08c5d 100644 --- a/libavcodec/vmnc.c +++ b/libavcodec/vmnc.c @@ -571,7 +571,7 @@ static av_cold int decode_end(AVCodecContext *avctx) const FFCodec ff_vmnc_decoder = { .p.name = "vmnc", - .p.long_name = NULL_IF_CONFIG_SMALL("VMware Screen Codec / VMware Video"), + CODEC_LONG_NAME("VMware Screen Codec / VMware Video"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_VMNC, .priv_data_size = sizeof(VmncContext), diff --git a/libavcodec/vorbisdec.c b/libavcodec/vorbisdec.c index 8addc07dcf..4d03947c49 100644 --- a/libavcodec/vorbisdec.c +++ b/libavcodec/vorbisdec.c @@ -1886,7 +1886,7 @@ static av_cold void vorbis_decode_flush(AVCodecContext *avctx) const FFCodec ff_vorbis_decoder = { .p.name = "vorbis", - .p.long_name = NULL_IF_CONFIG_SMALL("Vorbis"), + CODEC_LONG_NAME("Vorbis"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_VORBIS, .priv_data_size = sizeof(vorbis_context), diff --git a/libavcodec/vorbisenc.c b/libavcodec/vorbisenc.c index 20abb2a670..b33d758e44 100644 --- a/libavcodec/vorbisenc.c +++ b/libavcodec/vorbisenc.c @@ -1297,7 +1297,7 @@ static av_cold int vorbis_encode_init(AVCodecContext *avctx) const FFCodec ff_vorbis_encoder = { .p.name = "vorbis", - .p.long_name = NULL_IF_CONFIG_SMALL("Vorbis"), + CODEC_LONG_NAME("Vorbis"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_VORBIS, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY | diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c index 4734025244..58dd81cd61 100644 --- a/libavcodec/vp3.c +++ b/libavcodec/vp3.c @@ -3169,7 +3169,7 @@ static av_cold int theora_decode_init(AVCodecContext *avctx) const FFCodec ff_theora_decoder = { .p.name = "theora", - .p.long_name = NULL_IF_CONFIG_SMALL("Theora"), + CODEC_LONG_NAME("Theora"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_THEORA, .priv_data_size = sizeof(Vp3DecodeContext), @@ -3187,7 +3187,7 @@ const FFCodec ff_theora_decoder = { const FFCodec ff_vp3_decoder = { .p.name = "vp3", - .p.long_name = NULL_IF_CONFIG_SMALL("On2 VP3"), + CODEC_LONG_NAME("On2 VP3"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_VP3, .priv_data_size = sizeof(Vp3DecodeContext), @@ -3205,7 +3205,7 @@ const FFCodec ff_vp3_decoder = { #if CONFIG_VP4_DECODER const FFCodec ff_vp4_decoder = { .p.name = "vp4", - .p.long_name = NULL_IF_CONFIG_SMALL("On2 VP4"), + CODEC_LONG_NAME("On2 VP4"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_VP4, .priv_data_size = sizeof(Vp3DecodeContext), diff --git a/libavcodec/vp5.c b/libavcodec/vp5.c index 9ddc6fa70d..579333506a 100644 --- a/libavcodec/vp5.c +++ b/libavcodec/vp5.c @@ -305,7 +305,7 @@ static av_cold int vp56_free(AVCodecContext *avctx) const FFCodec ff_vp5_decoder = { .p.name = "vp5", - .p.long_name = NULL_IF_CONFIG_SMALL("On2 VP5"), + CODEC_LONG_NAME("On2 VP5"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_VP5, .priv_data_size = sizeof(VP56Context), diff --git a/libavcodec/vp6.c b/libavcodec/vp6.c index f7815d7398..9bbfa0eb5d 100644 --- a/libavcodec/vp6.c +++ b/libavcodec/vp6.c @@ -715,7 +715,7 @@ static av_cold void vp6_decode_free_context(VP56Context *s) const FFCodec ff_vp6_decoder = { .p.name = "vp6", - .p.long_name = NULL_IF_CONFIG_SMALL("On2 VP6"), + CODEC_LONG_NAME("On2 VP6"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_VP6, .priv_data_size = sizeof(VP56Context), @@ -729,7 +729,7 @@ const FFCodec ff_vp6_decoder = { /* flash version, not flipped upside-down */ const FFCodec ff_vp6f_decoder = { .p.name = "vp6f", - .p.long_name = NULL_IF_CONFIG_SMALL("On2 VP6 (Flash version)"), + CODEC_LONG_NAME("On2 VP6 (Flash version)"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_VP6F, .priv_data_size = sizeof(VP56Context), @@ -743,7 +743,7 @@ const FFCodec ff_vp6f_decoder = { /* flash version, not flipped upside-down, with alpha channel */ const FFCodec ff_vp6a_decoder = { .p.name = "vp6a", - .p.long_name = NULL_IF_CONFIG_SMALL("On2 VP6 (Flash version, with alpha channel)"), + CODEC_LONG_NAME("On2 VP6 (Flash version, with alpha channel)"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_VP6A, .priv_data_size = 2 /* Main context + alpha context */ * sizeof(VP56Context), diff --git a/libavcodec/vp8.c b/libavcodec/vp8.c index ab38c76735..6545002fd7 100644 --- a/libavcodec/vp8.c +++ b/libavcodec/vp8.c @@ -2977,7 +2977,7 @@ static int vp8_decode_update_thread_context(AVCodecContext *dst, #if CONFIG_VP7_DECODER const FFCodec ff_vp7_decoder = { .p.name = "vp7", - .p.long_name = NULL_IF_CONFIG_SMALL("On2 VP7"), + CODEC_LONG_NAME("On2 VP7"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_VP7, .priv_data_size = sizeof(VP8Context), @@ -2992,7 +2992,7 @@ const FFCodec ff_vp7_decoder = { #if CONFIG_VP8_DECODER const FFCodec ff_vp8_decoder = { .p.name = "vp8", - .p.long_name = NULL_IF_CONFIG_SMALL("On2 VP8"), + CODEC_LONG_NAME("On2 VP8"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_VP8, .priv_data_size = sizeof(VP8Context), diff --git a/libavcodec/vp9.c b/libavcodec/vp9.c index fe85c17133..acbbce5624 100644 --- a/libavcodec/vp9.c +++ b/libavcodec/vp9.c @@ -1870,7 +1870,7 @@ static int vp9_decode_update_thread_context(AVCodecContext *dst, const AVCodecCo const FFCodec ff_vp9_decoder = { .p.name = "vp9", - .p.long_name = NULL_IF_CONFIG_SMALL("Google VP9"), + CODEC_LONG_NAME("Google VP9"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_VP9, .priv_data_size = sizeof(VP9Context), diff --git a/libavcodec/vqavideo.c b/libavcodec/vqavideo.c index 4006b1433c..0573696d94 100644 --- a/libavcodec/vqavideo.c +++ b/libavcodec/vqavideo.c @@ -846,7 +846,7 @@ static const FFCodecDefault vqa_defaults[] = { const FFCodec ff_vqa_decoder = { .p.name = "vqavideo", - .p.long_name = NULL_IF_CONFIG_SMALL("Westwood Studios VQA (Vector Quantized Animation) video"), + CODEC_LONG_NAME("Westwood Studios VQA (Vector Quantized Animation) video"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_WS_VQA, .priv_data_size = sizeof(VqaContext), diff --git a/libavcodec/wavpack.c b/libavcodec/wavpack.c index a09ce00fe2..a326b06e94 100644 --- a/libavcodec/wavpack.c +++ b/libavcodec/wavpack.c @@ -1699,7 +1699,7 @@ error: const FFCodec ff_wavpack_decoder = { .p.name = "wavpack", - .p.long_name = NULL_IF_CONFIG_SMALL("WavPack"), + CODEC_LONG_NAME("WavPack"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_WAVPACK, .priv_data_size = sizeof(WavpackContext), diff --git a/libavcodec/wavpackenc.c b/libavcodec/wavpackenc.c index d813d7a63f..bdb536382f 100644 --- a/libavcodec/wavpackenc.c +++ b/libavcodec/wavpackenc.c @@ -2960,7 +2960,7 @@ static const AVClass wavpack_encoder_class = { const FFCodec ff_wavpack_encoder = { .p.name = "wavpack", - .p.long_name = NULL_IF_CONFIG_SMALL("WavPack"), + CODEC_LONG_NAME("WavPack"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_WAVPACK, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_SMALL_LAST_FRAME, diff --git a/libavcodec/wbmpdec.c b/libavcodec/wbmpdec.c index c289b08bcc..9638b55b94 100644 --- a/libavcodec/wbmpdec.c +++ b/libavcodec/wbmpdec.c @@ -84,7 +84,7 @@ static int wbmp_decode_frame(AVCodecContext *avctx, AVFrame *p, const FFCodec ff_wbmp_decoder = { .p.name = "wbmp", - .p.long_name = NULL_IF_CONFIG_SMALL("WBMP (Wireless Application Protocol Bitmap) image"), + CODEC_LONG_NAME("WBMP (Wireless Application Protocol Bitmap) image"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_WBMP, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS, diff --git a/libavcodec/wbmpenc.c b/libavcodec/wbmpenc.c index c2dd5f5ca9..25fac746fc 100644 --- a/libavcodec/wbmpenc.c +++ b/libavcodec/wbmpenc.c @@ -77,7 +77,7 @@ static int wbmp_encode_frame(AVCodecContext *avctx, AVPacket *pkt, const FFCodec ff_wbmp_encoder = { .p.name = "wbmp", - .p.long_name = NULL_IF_CONFIG_SMALL("WBMP (Wireless Application Protocol Bitmap) image"), + CODEC_LONG_NAME("WBMP (Wireless Application Protocol Bitmap) image"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_WBMP, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS, diff --git a/libavcodec/wcmv.c b/libavcodec/wcmv.c index 8bc900f304..2f1d22bc24 100644 --- a/libavcodec/wcmv.c +++ b/libavcodec/wcmv.c @@ -240,7 +240,7 @@ static av_cold int decode_close(AVCodecContext *avctx) const FFCodec ff_wcmv_decoder = { .p.name = "wcmv", - .p.long_name = NULL_IF_CONFIG_SMALL("WinCAM Motion Video"), + CODEC_LONG_NAME("WinCAM Motion Video"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_WCMV, .priv_data_size = sizeof(WCMVContext), diff --git a/libavcodec/webp.c b/libavcodec/webp.c index dca5e451f2..b4357f95d5 100644 --- a/libavcodec/webp.c +++ b/libavcodec/webp.c @@ -1557,7 +1557,7 @@ static av_cold int webp_decode_close(AVCodecContext *avctx) const FFCodec ff_webp_decoder = { .p.name = "webp", - .p.long_name = NULL_IF_CONFIG_SMALL("WebP image"), + CODEC_LONG_NAME("WebP image"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_WEBP, .priv_data_size = sizeof(WebPContext), diff --git a/libavcodec/webvttdec.c b/libavcodec/webvttdec.c index e245e83ad3..690f00dc47 100644 --- a/libavcodec/webvttdec.c +++ b/libavcodec/webvttdec.c @@ -100,7 +100,7 @@ static int webvtt_decode_frame(AVCodecContext *avctx, AVSubtitle *sub, const FFCodec ff_webvtt_decoder = { .p.name = "webvtt", - .p.long_name = NULL_IF_CONFIG_SMALL("WebVTT subtitle"), + CODEC_LONG_NAME("WebVTT subtitle"), .p.type = AVMEDIA_TYPE_SUBTITLE, .p.id = AV_CODEC_ID_WEBVTT, FF_CODEC_DECODE_SUB_CB(webvtt_decode_frame), diff --git a/libavcodec/webvttenc.c b/libavcodec/webvttenc.c index f47a5c51d4..4369aacb74 100644 --- a/libavcodec/webvttenc.c +++ b/libavcodec/webvttenc.c @@ -213,7 +213,7 @@ static av_cold int webvtt_encode_init(AVCodecContext *avctx) const FFCodec ff_webvtt_encoder = { .p.name = "webvtt", - .p.long_name = NULL_IF_CONFIG_SMALL("WebVTT subtitle"), + CODEC_LONG_NAME("WebVTT subtitle"), .p.type = AVMEDIA_TYPE_SUBTITLE, .p.id = AV_CODEC_ID_WEBVTT, .priv_data_size = sizeof(WebVTTContext), diff --git a/libavcodec/wmadec.c b/libavcodec/wmadec.c index c3badcd5f9..4bc6a28daf 100644 --- a/libavcodec/wmadec.c +++ b/libavcodec/wmadec.c @@ -1002,7 +1002,7 @@ static av_cold void flush(AVCodecContext *avctx) #if CONFIG_WMAV1_DECODER const FFCodec ff_wmav1_decoder = { .p.name = "wmav1", - .p.long_name = NULL_IF_CONFIG_SMALL("Windows Media Audio 1"), + CODEC_LONG_NAME("Windows Media Audio 1"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_WMAV1, .priv_data_size = sizeof(WMACodecContext), @@ -1019,7 +1019,7 @@ const FFCodec ff_wmav1_decoder = { #if CONFIG_WMAV2_DECODER const FFCodec ff_wmav2_decoder = { .p.name = "wmav2", - .p.long_name = NULL_IF_CONFIG_SMALL("Windows Media Audio 2"), + CODEC_LONG_NAME("Windows Media Audio 2"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_WMAV2, .priv_data_size = sizeof(WMACodecContext), diff --git a/libavcodec/wmaenc.c b/libavcodec/wmaenc.c index 95b992859a..90bb6949cb 100644 --- a/libavcodec/wmaenc.c +++ b/libavcodec/wmaenc.c @@ -434,7 +434,7 @@ static int encode_superframe(AVCodecContext *avctx, AVPacket *avpkt, #if CONFIG_WMAV1_ENCODER const FFCodec ff_wmav1_encoder = { .p.name = "wmav1", - .p.long_name = NULL_IF_CONFIG_SMALL("Windows Media Audio 1"), + CODEC_LONG_NAME("Windows Media Audio 1"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_WMAV1, .p.capabilities = AV_CODEC_CAP_DR1, @@ -450,7 +450,7 @@ const FFCodec ff_wmav1_encoder = { #if CONFIG_WMAV2_ENCODER const FFCodec ff_wmav2_encoder = { .p.name = "wmav2", - .p.long_name = NULL_IF_CONFIG_SMALL("Windows Media Audio 2"), + CODEC_LONG_NAME("Windows Media Audio 2"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_WMAV2, .p.capabilities = AV_CODEC_CAP_DR1, diff --git a/libavcodec/wmalosslessdec.c b/libavcodec/wmalosslessdec.c index fa4230c1b5..5112b763fa 100644 --- a/libavcodec/wmalosslessdec.c +++ b/libavcodec/wmalosslessdec.c @@ -1327,7 +1327,7 @@ static av_cold int decode_close(AVCodecContext *avctx) const FFCodec ff_wmalossless_decoder = { .p.name = "wmalossless", - .p.long_name = NULL_IF_CONFIG_SMALL("Windows Media Audio Lossless"), + CODEC_LONG_NAME("Windows Media Audio Lossless"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_WMALOSSLESS, .priv_data_size = sizeof(WmallDecodeCtx), diff --git a/libavcodec/wmaprodec.c b/libavcodec/wmaprodec.c index b90fd581f0..7cfd0c04be 100644 --- a/libavcodec/wmaprodec.c +++ b/libavcodec/wmaprodec.c @@ -2083,7 +2083,7 @@ static void xma_flush(AVCodecContext *avctx) */ const FFCodec ff_wmapro_decoder = { .p.name = "wmapro", - .p.long_name = NULL_IF_CONFIG_SMALL("Windows Media Audio 9 Professional"), + CODEC_LONG_NAME("Windows Media Audio 9 Professional"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_WMAPRO, .priv_data_size = sizeof(WMAProDecodeCtx), @@ -2099,7 +2099,7 @@ const FFCodec ff_wmapro_decoder = { const FFCodec ff_xma1_decoder = { .p.name = "xma1", - .p.long_name = NULL_IF_CONFIG_SMALL("Xbox Media Audio 1"), + CODEC_LONG_NAME("Xbox Media Audio 1"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_XMA1, .priv_data_size = sizeof(XMADecodeCtx), @@ -2114,7 +2114,7 @@ const FFCodec ff_xma1_decoder = { const FFCodec ff_xma2_decoder = { .p.name = "xma2", - .p.long_name = NULL_IF_CONFIG_SMALL("Xbox Media Audio 2"), + CODEC_LONG_NAME("Xbox Media Audio 2"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_XMA2, .priv_data_size = sizeof(XMADecodeCtx), diff --git a/libavcodec/wmavoice.c b/libavcodec/wmavoice.c index 6b7e9d5a31..8fa9db63ee 100644 --- a/libavcodec/wmavoice.c +++ b/libavcodec/wmavoice.c @@ -2000,7 +2000,7 @@ static av_cold int wmavoice_decode_end(AVCodecContext *ctx) const FFCodec ff_wmavoice_decoder = { .p.name = "wmavoice", - .p.long_name = NULL_IF_CONFIG_SMALL("Windows Media Audio Voice"), + CODEC_LONG_NAME("Windows Media Audio Voice"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_WMAVOICE, .priv_data_size = sizeof(WMAVoiceContext), diff --git a/libavcodec/wmv2dec.c b/libavcodec/wmv2dec.c index 22eb012f56..f638b31cec 100644 --- a/libavcodec/wmv2dec.c +++ b/libavcodec/wmv2dec.c @@ -597,7 +597,7 @@ static av_cold int wmv2_decode_end(AVCodecContext *avctx) const FFCodec ff_wmv2_decoder = { .p.name = "wmv2", - .p.long_name = NULL_IF_CONFIG_SMALL("Windows Media Video 8"), + CODEC_LONG_NAME("Windows Media Video 8"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_WMV2, .priv_data_size = sizeof(WMV2DecContext), diff --git a/libavcodec/wmv2enc.c b/libavcodec/wmv2enc.c index 2f6c688b2a..8a6d897468 100644 --- a/libavcodec/wmv2enc.c +++ b/libavcodec/wmv2enc.c @@ -235,7 +235,7 @@ void ff_wmv2_encode_mb(MpegEncContext *s, int16_t block[6][64], const FFCodec ff_wmv2_encoder = { .p.name = "wmv2", - .p.long_name = NULL_IF_CONFIG_SMALL("Windows Media Video 8"), + CODEC_LONG_NAME("Windows Media Video 8"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_WMV2, .p.priv_class = &ff_mpv_enc_class, diff --git a/libavcodec/wnv1.c b/libavcodec/wnv1.c index ff5238eed0..88532ee426 100644 --- a/libavcodec/wnv1.c +++ b/libavcodec/wnv1.c @@ -137,7 +137,7 @@ static av_cold int decode_init(AVCodecContext *avctx) const FFCodec ff_wnv1_decoder = { .p.name = "wnv1", - .p.long_name = NULL_IF_CONFIG_SMALL("Winnov WNV1"), + CODEC_LONG_NAME("Winnov WNV1"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_WNV1, .init = decode_init, diff --git a/libavcodec/wrapped_avframe.c b/libavcodec/wrapped_avframe.c index def29a9060..c9579848e6 100644 --- a/libavcodec/wrapped_avframe.c +++ b/libavcodec/wrapped_avframe.c @@ -106,7 +106,7 @@ static int wrapped_avframe_decode(AVCodecContext *avctx, AVFrame *out, const FFCodec ff_wrapped_avframe_encoder = { .p.name = "wrapped_avframe", - .p.long_name = NULL_IF_CONFIG_SMALL("AVFrame to AVPacket passthrough"), + CODEC_LONG_NAME("AVFrame to AVPacket passthrough"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_WRAPPED_AVFRAME, FF_CODEC_ENCODE_CB(wrapped_avframe_encode), @@ -114,7 +114,7 @@ const FFCodec ff_wrapped_avframe_encoder = { const FFCodec ff_wrapped_avframe_decoder = { .p.name = "wrapped_avframe", - .p.long_name = NULL_IF_CONFIG_SMALL("AVPacket to AVFrame passthrough"), + CODEC_LONG_NAME("AVPacket to AVFrame passthrough"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_WRAPPED_AVFRAME, FF_CODEC_DECODE_CB(wrapped_avframe_decode), diff --git a/libavcodec/ws-snd1.c b/libavcodec/ws-snd1.c index 6dcb8d2a24..0e97ef2165 100644 --- a/libavcodec/ws-snd1.c +++ b/libavcodec/ws-snd1.c @@ -172,7 +172,7 @@ static int ws_snd_decode_frame(AVCodecContext *avctx, AVFrame *frame, const FFCodec ff_ws_snd1_decoder = { .p.name = "ws_snd1", - .p.long_name = NULL_IF_CONFIG_SMALL("Westwood Audio (SND1)"), + CODEC_LONG_NAME("Westwood Audio (SND1)"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_WESTWOOD_SND1, .init = ws_snd_decode_init, diff --git a/libavcodec/xan.c b/libavcodec/xan.c index d9df569a04..14fc2443c5 100644 --- a/libavcodec/xan.c +++ b/libavcodec/xan.c @@ -634,7 +634,7 @@ static int xan_decode_frame(AVCodecContext *avctx, AVFrame *frame, const FFCodec ff_xan_wc3_decoder = { .p.name = "xan_wc3", - .p.long_name = NULL_IF_CONFIG_SMALL("Wing Commander III / Xan"), + CODEC_LONG_NAME("Wing Commander III / Xan"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_XAN_WC3, .priv_data_size = sizeof(XanContext), diff --git a/libavcodec/xbmdec.c b/libavcodec/xbmdec.c index f38f9dd1e8..6a31215329 100644 --- a/libavcodec/xbmdec.c +++ b/libavcodec/xbmdec.c @@ -137,7 +137,7 @@ static int xbm_decode_frame(AVCodecContext *avctx, AVFrame *p, const FFCodec ff_xbm_decoder = { .p.name = "xbm", - .p.long_name = NULL_IF_CONFIG_SMALL("XBM (X BitMap) image"), + CODEC_LONG_NAME("XBM (X BitMap) image"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_XBM, .p.capabilities = AV_CODEC_CAP_DR1, diff --git a/libavcodec/xbmenc.c b/libavcodec/xbmenc.c index d4b8a542d9..664c6599bf 100644 --- a/libavcodec/xbmenc.c +++ b/libavcodec/xbmenc.c @@ -79,7 +79,7 @@ static int xbm_encode_frame(AVCodecContext *avctx, AVPacket *pkt, const FFCodec ff_xbm_encoder = { .p.name = "xbm", - .p.long_name = NULL_IF_CONFIG_SMALL("XBM (X BitMap) image"), + CODEC_LONG_NAME("XBM (X BitMap) image"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_XBM, .p.capabilities = AV_CODEC_CAP_DR1, diff --git a/libavcodec/xfacedec.c b/libavcodec/xfacedec.c index eb16bb6727..378d6aea0e 100644 --- a/libavcodec/xfacedec.c +++ b/libavcodec/xfacedec.c @@ -175,7 +175,7 @@ static int xface_decode_frame(AVCodecContext *avctx, AVFrame *frame, const FFCodec ff_xface_decoder = { .p.name = "xface", - .p.long_name = NULL_IF_CONFIG_SMALL("X-face image"), + CODEC_LONG_NAME("X-face image"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_XFACE, .p.capabilities = AV_CODEC_CAP_DR1, diff --git a/libavcodec/xfaceenc.c b/libavcodec/xfaceenc.c index a46b7133e7..7125f1f085 100644 --- a/libavcodec/xfaceenc.c +++ b/libavcodec/xfaceenc.c @@ -213,7 +213,7 @@ static int xface_encode_frame(AVCodecContext *avctx, AVPacket *pkt, const FFCodec ff_xface_encoder = { .p.name = "xface", - .p.long_name = NULL_IF_CONFIG_SMALL("X-face image"), + CODEC_LONG_NAME("X-face image"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_XFACE, .p.capabilities = AV_CODEC_CAP_DR1, diff --git a/libavcodec/xl.c b/libavcodec/xl.c index ada0959346..283cd39aa7 100644 --- a/libavcodec/xl.c +++ b/libavcodec/xl.c @@ -128,7 +128,7 @@ static av_cold int decode_init(AVCodecContext *avctx) const FFCodec ff_xl_decoder = { .p.name = "xl", - .p.long_name = NULL_IF_CONFIG_SMALL("Miro VideoXL"), + CODEC_LONG_NAME("Miro VideoXL"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_VIXL, .init = decode_init, diff --git a/libavcodec/xpmdec.c b/libavcodec/xpmdec.c index c005dc1e3a..d0e5d696e7 100644 --- a/libavcodec/xpmdec.c +++ b/libavcodec/xpmdec.c @@ -437,7 +437,7 @@ static av_cold int xpm_decode_close(AVCodecContext *avctx) const FFCodec ff_xpm_decoder = { .p.name = "xpm", - .p.long_name = NULL_IF_CONFIG_SMALL("XPM (X PixMap) image"), + CODEC_LONG_NAME("XPM (X PixMap) image"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_XPM, .p.capabilities = AV_CODEC_CAP_DR1, diff --git a/libavcodec/xsubdec.c b/libavcodec/xsubdec.c index 49c8e8e7ff..f86b7c58e7 100644 --- a/libavcodec/xsubdec.c +++ b/libavcodec/xsubdec.c @@ -156,7 +156,7 @@ static int decode_frame(AVCodecContext *avctx, AVSubtitle *sub, const FFCodec ff_xsub_decoder = { .p.name = "xsub", - .p.long_name = NULL_IF_CONFIG_SMALL("XSUB"), + CODEC_LONG_NAME("XSUB"), .p.type = AVMEDIA_TYPE_SUBTITLE, .p.id = AV_CODEC_ID_XSUB, .init = decode_init, diff --git a/libavcodec/xsubenc.c b/libavcodec/xsubenc.c index cc0fc094ef..6f417c5958 100644 --- a/libavcodec/xsubenc.c +++ b/libavcodec/xsubenc.c @@ -213,7 +213,7 @@ static av_cold int xsub_encoder_init(AVCodecContext *avctx) const FFCodec ff_xsub_encoder = { .p.name = "xsub", - .p.long_name = NULL_IF_CONFIG_SMALL("DivX subtitles (XSUB)"), + CODEC_LONG_NAME("DivX subtitles (XSUB)"), .p.type = AVMEDIA_TYPE_SUBTITLE, .p.id = AV_CODEC_ID_XSUB, .init = xsub_encoder_init, diff --git a/libavcodec/xwddec.c b/libavcodec/xwddec.c index f3703292ca..cee230a363 100644 --- a/libavcodec/xwddec.c +++ b/libavcodec/xwddec.c @@ -249,7 +249,7 @@ static int xwd_decode_frame(AVCodecContext *avctx, AVFrame *p, const FFCodec ff_xwd_decoder = { .p.name = "xwd", - .p.long_name = NULL_IF_CONFIG_SMALL("XWD (X Window Dump) image"), + CODEC_LONG_NAME("XWD (X Window Dump) image"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_XWD, .p.capabilities = AV_CODEC_CAP_DR1, diff --git a/libavcodec/xwdenc.c b/libavcodec/xwdenc.c index 01c43c1d81..6c588f3acc 100644 --- a/libavcodec/xwdenc.c +++ b/libavcodec/xwdenc.c @@ -213,7 +213,7 @@ static int xwd_encode_frame(AVCodecContext *avctx, AVPacket *pkt, const FFCodec ff_xwd_encoder = { .p.name = "xwd", - .p.long_name = NULL_IF_CONFIG_SMALL("XWD (X Window Dump) image"), + CODEC_LONG_NAME("XWD (X Window Dump) image"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_XWD, .p.capabilities = AV_CODEC_CAP_DR1, diff --git a/libavcodec/xxan.c b/libavcodec/xxan.c index 555925e5b5..cb6a97c668 100644 --- a/libavcodec/xxan.c +++ b/libavcodec/xxan.c @@ -435,7 +435,7 @@ static int xan_decode_frame(AVCodecContext *avctx, AVFrame *rframe, const FFCodec ff_xan_wc4_decoder = { .p.name = "xan_wc4", - .p.long_name = NULL_IF_CONFIG_SMALL("Wing Commander IV / Xxan"), + CODEC_LONG_NAME("Wing Commander IV / Xxan"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_XAN_WC4, .priv_data_size = sizeof(XanContext), diff --git a/libavcodec/y41pdec.c b/libavcodec/y41pdec.c index 7d63228937..b461f349ad 100644 --- a/libavcodec/y41pdec.c +++ b/libavcodec/y41pdec.c @@ -83,7 +83,7 @@ static int y41p_decode_frame(AVCodecContext *avctx, AVFrame *pic, const FFCodec ff_y41p_decoder = { .p.name = "y41p", - .p.long_name = NULL_IF_CONFIG_SMALL("Uncompressed YUV 4:1:1 12-bit"), + CODEC_LONG_NAME("Uncompressed YUV 4:1:1 12-bit"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_Y41P, .init = y41p_decode_init, diff --git a/libavcodec/y41penc.c b/libavcodec/y41penc.c index f7ac58c30e..d3ef88c2ce 100644 --- a/libavcodec/y41penc.c +++ b/libavcodec/y41penc.c @@ -79,7 +79,7 @@ static int y41p_encode_frame(AVCodecContext *avctx, AVPacket *pkt, const FFCodec ff_y41p_encoder = { .p.name = "y41p", - .p.long_name = NULL_IF_CONFIG_SMALL("Uncompressed YUV 4:1:1 12-bit"), + CODEC_LONG_NAME("Uncompressed YUV 4:1:1 12-bit"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_Y41P, .p.capabilities = AV_CODEC_CAP_DR1, diff --git a/libavcodec/ylc.c b/libavcodec/ylc.c index 4f629bd6cd..3ea6749ffe 100644 --- a/libavcodec/ylc.c +++ b/libavcodec/ylc.c @@ -451,7 +451,7 @@ static av_cold int decode_end(AVCodecContext *avctx) const FFCodec ff_ylc_decoder = { .p.name = "ylc", - .p.long_name = NULL_IF_CONFIG_SMALL("YUY2 Lossless Codec"), + CODEC_LONG_NAME("YUY2 Lossless Codec"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_YLC, .priv_data_size = sizeof(YLCContext), diff --git a/libavcodec/yop.c b/libavcodec/yop.c index 33d8c8b815..816fe8bdc8 100644 --- a/libavcodec/yop.c +++ b/libavcodec/yop.c @@ -267,7 +267,7 @@ static int yop_decode_frame(AVCodecContext *avctx, AVFrame *rframe, const FFCodec ff_yop_decoder = { .p.name = "yop", - .p.long_name = NULL_IF_CONFIG_SMALL("Psygnosis YOP Video"), + CODEC_LONG_NAME("Psygnosis YOP Video"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_YOP, .priv_data_size = sizeof(YopDecContext), diff --git a/libavcodec/yuv4dec.c b/libavcodec/yuv4dec.c index 274b8b7b2d..15424b1940 100644 --- a/libavcodec/yuv4dec.c +++ b/libavcodec/yuv4dec.c @@ -75,7 +75,7 @@ static int yuv4_decode_frame(AVCodecContext *avctx, AVFrame *pic, const FFCodec ff_yuv4_decoder = { .p.name = "yuv4", - .p.long_name = NULL_IF_CONFIG_SMALL("Uncompressed packed 4:2:0"), + CODEC_LONG_NAME("Uncompressed packed 4:2:0"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_YUV4, .init = yuv4_decode_init, diff --git a/libavcodec/yuv4enc.c b/libavcodec/yuv4enc.c index 94e9b5dc1b..27e786dd54 100644 --- a/libavcodec/yuv4enc.c +++ b/libavcodec/yuv4enc.c @@ -61,7 +61,7 @@ static int yuv4_encode_frame(AVCodecContext *avctx, AVPacket *pkt, const FFCodec ff_yuv4_encoder = { .p.name = "yuv4", - .p.long_name = NULL_IF_CONFIG_SMALL("Uncompressed packed 4:2:0"), + CODEC_LONG_NAME("Uncompressed packed 4:2:0"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_YUV4, .p.capabilities = AV_CODEC_CAP_DR1, diff --git a/libavcodec/zerocodec.c b/libavcodec/zerocodec.c index c369ff8e3c..93fc2834e4 100644 --- a/libavcodec/zerocodec.c +++ b/libavcodec/zerocodec.c @@ -136,7 +136,7 @@ static void zerocodec_decode_flush(AVCodecContext *avctx) const FFCodec ff_zerocodec_decoder = { .p.type = AVMEDIA_TYPE_VIDEO, .p.name = "zerocodec", - .p.long_name = NULL_IF_CONFIG_SMALL("ZeroCodec Lossless Video"), + CODEC_LONG_NAME("ZeroCodec Lossless Video"), .p.id = AV_CODEC_ID_ZEROCODEC, .priv_data_size = sizeof(ZeroCodecContext), .init = zerocodec_decode_init, diff --git a/libavcodec/zmbv.c b/libavcodec/zmbv.c index edbd88eb73..0b44851811 100644 --- a/libavcodec/zmbv.c +++ b/libavcodec/zmbv.c @@ -646,7 +646,7 @@ static av_cold int decode_end(AVCodecContext *avctx) const FFCodec ff_zmbv_decoder = { .p.name = "zmbv", - .p.long_name = NULL_IF_CONFIG_SMALL("Zip Motion Blocks Video"), + CODEC_LONG_NAME("Zip Motion Blocks Video"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_ZMBV, .priv_data_size = sizeof(ZmbvContext), diff --git a/libavcodec/zmbvenc.c b/libavcodec/zmbvenc.c index cc8578afea..c12f783d5a 100644 --- a/libavcodec/zmbvenc.c +++ b/libavcodec/zmbvenc.c @@ -413,7 +413,7 @@ static av_cold int encode_init(AVCodecContext *avctx) const FFCodec ff_zmbv_encoder = { .p.name = "zmbv", - .p.long_name = NULL_IF_CONFIG_SMALL("Zip Motion Blocks Video"), + CODEC_LONG_NAME("Zip Motion Blocks Video"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_ZMBV, .p.capabilities = AV_CODEC_CAP_DR1, diff --git a/libavutil/internal.h b/libavutil/internal.h index 14f3acec58..40072d4e30 100644 --- a/libavutil/internal.h +++ b/libavutil/internal.h @@ -107,8 +107,7 @@ /** * Return NULL if CONFIG_SMALL is true, otherwise the argument - * without modification. Used to disable the definition of strings - * (for example AVCodec long_names). + * without modification. Used to disable the definition of strings. */ #if CONFIG_SMALL # define NULL_IF_CONFIG_SMALL(x) NULL |