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>
2 years ago · 48286d4d98
parent dea9744560
commit 48286d4d98
503 changed files with 623 additions and 618 deletions
--- 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,
--- 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),
--- 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),
--- 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),
--- 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,
--- 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),
--- 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),
--- 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 |
--- 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),
--- 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,
--- 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,
--- 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,
--- 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,
--- 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,                     \
--- 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_,                                        \
--- 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),
--- 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,
--- 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,
--- 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),
--- 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),
--- 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,
--- 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,
--- 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,
--- 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),
--- 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,
--- 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,
--- 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),
--- 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),
--- 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),
--- 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),
--- 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),
--- 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),
--- 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,
--- 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),
--- 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),
--- 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,
--- 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,
--- 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),
--- 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,
--- 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),
--- 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),
--- 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,
--- 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),
--- 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), \
--- 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), \
--- 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,
--- 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),
--- 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),
--- 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),
--- 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,
--- 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,
--- 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),
--- 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),
--- 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),
--- 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),
--- 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),
--- 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,
--- 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),
--- 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,
--- 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,
--- 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,
--- 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),
--- 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,
--- 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),
--- 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),
--- 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,
--- 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),
--- 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),
--- 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),
--- 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),
--- 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,
--- 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),
--- 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,
--- 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),
--- 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,
--- 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,
--- 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),
--- 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),
--- 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,
--- 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)
--- 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),
--- 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),
--- 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"),
 };
--- 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), \
--- 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),
--- 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), \
--- 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),
--- 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),
--- 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,
--- 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),
--- 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),
--- 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),
--- 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),
--- 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),
--- 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),
--- 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 |
--- 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),
--- 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,                     \
--- 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),
--- 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,
--- a/Show More
+++ b/Show More