Make AVCodec long_names definition conditional depending on CONFIG_SMALL.

Originally committed as revision 13759 to svn://svn.ffmpeg.org/ffmpeg/trunk
17 years ago · fe4bf37455
parent d18811bbf5
commit fe4bf37455
167 changed files with 235 additions and 231 deletions
--- a/libavcodec/4xm.c
+++ b/libavcodec/4xm.c
@ -836,6 +836,6 @@ AVCodec fourxm_decoder = {
    decode_end,
    decode_frame,
    /*CODEC_CAP_DR1,*/
-    .long_name = "4X Movie",
+    .long_name = NULL_IF_CONFIG_SMALL("4X Movie"),
 };

--- a/libavcodec/8bps.c
+++ b/libavcodec/8bps.c
@ -230,5 +230,5 @@ AVCodec eightbps_decoder = {
        decode_end,
        decode_frame,
        CODEC_CAP_DR1,
-        .long_name = "QuickTime 8BPS video",
+        .long_name = NULL_IF_CONFIG_SMALL("QuickTime 8BPS video"),
 };
--- a/libavcodec/8svx.c
+++ b/libavcodec/8svx.c
@ -96,7 +96,7 @@ AVCodec eightsvx_fib_decoder = {
  .priv_data_size = sizeof (EightSvxContext),
  .init           = eightsvx_decode_init,
  .decode         = eightsvx_decode_frame,
-  .long_name      = "8SVX fibonacci",
+  .long_name      = NULL_IF_CONFIG_SMALL("8SVX fibonacci"),
 };

 AVCodec eightsvx_exp_decoder = {
@ -106,5 +106,5 @@ AVCodec eightsvx_exp_decoder = {
  .priv_data_size = sizeof (EightSvxContext),
  .init           = eightsvx_decode_init,
  .decode         = eightsvx_decode_frame,
-  .long_name      = "8SVX exponential",
+  .long_name      = NULL_IF_CONFIG_SMALL("8SVX exponential"),
 };
--- a/libavcodec/aasc.c
+++ b/libavcodec/aasc.c
@ -171,5 +171,5 @@ AVCodec aasc_decoder = {
    aasc_decode_end,
    aasc_decode_frame,
    CODEC_CAP_DR1,
-    .long_name = "Autodesk RLE",
+    .long_name = NULL_IF_CONFIG_SMALL("Autodesk RLE"),
 };
--- a/libavcodec/ac3dec.c
+++ b/libavcodec/ac3dec.c
@ -1198,5 +1198,5 @@ AVCodec ac3_decoder = {
    .init = ac3_decode_init,
    .close = ac3_decode_end,
    .decode = ac3_decode_frame,
-    .long_name = "ATSC A/52 / AC-3",
+    .long_name = NULL_IF_CONFIG_SMALL("ATSC A/52 / AC-3"),
 };
--- a/libavcodec/ac3enc.c
+++ b/libavcodec/ac3enc.c
@ -1364,5 +1364,5 @@ AVCodec ac3_encoder = {
    AC3_encode_frame,
    AC3_encode_close,
    NULL,
-    .long_name = "ATSC A/52 / AC-3",
+    .long_name = NULL_IF_CONFIG_SMALL("ATSC A/52 / AC-3"),
 };
--- a/libavcodec/adpcm.c
+++ b/libavcodec/adpcm.c
@ -1610,7 +1610,7 @@ AVCodec name ## _encoder = {                    \
    adpcm_encode_frame,                         \
    adpcm_encode_close,                         \
    NULL,                                       \
-    .long_name = long_name_,                    \
+    .long_name = NULL_IF_CONFIG_SMALL(long_name_), \
 };
 #else
 #define ADPCM_ENCODER(id,name,long_name_)
@ -1627,7 +1627,7 @@ AVCodec name ## _decoder = {                    \
    NULL,                                       \
    NULL,                                       \
    adpcm_decode_frame,                         \
-    .long_name = long_name_,                    \
+    .long_name = NULL_IF_CONFIG_SMALL(long_name_), \
 };
 #else
 #define ADPCM_DECODER(id,name,long_name_)
--- a/libavcodec/adxdec.c
+++ b/libavcodec/adxdec.c
@ -165,6 +165,6 @@ AVCodec adpcm_adx_decoder = {
    NULL,
    NULL,
    adx_decode_frame,
-    .long_name = "SEGA CRI ADX",
+    .long_name = NULL_IF_CONFIG_SMALL("SEGA CRI ADX"),
 };

--- a/libavcodec/adxenc.c
+++ b/libavcodec/adxenc.c
@ -190,5 +190,5 @@ AVCodec adpcm_adx_encoder = {
    adx_encode_frame,
    adx_encode_close,
    NULL,
-    .long_name = "SEGA CRI ADX",
+    .long_name = NULL_IF_CONFIG_SMALL("SEGA CRI ADX"),
 };
--- a/libavcodec/alac.c
+++ b/libavcodec/alac.c
@ -620,5 +620,5 @@ AVCodec alac_decoder = {
    NULL,
    alac_decode_close,
    alac_decode_frame,
-    .long_name = "ALAC (Apple Lossless Audio Codec)",
+    .long_name = NULL_IF_CONFIG_SMALL("ALAC (Apple Lossless Audio Codec)"),
 };
--- a/libavcodec/apedec.c
+++ b/libavcodec/apedec.c
@ -917,5 +917,5 @@ AVCodec ape_decoder = {
    NULL,
    ape_decode_close,
    ape_decode_frame,
-    .long_name = "Monkey's Audio",
+    .long_name = NULL_IF_CONFIG_SMALL("Monkey's Audio"),
 };
--- a/libavcodec/asv1.c
+++ b/libavcodec/asv1.c
@ -615,7 +615,7 @@ AVCodec asv1_decoder = {
    decode_end,
    decode_frame,
    CODEC_CAP_DR1,
-    .long_name= "ASUS V1",
+    .long_name= NULL_IF_CONFIG_SMALL("ASUS V1"),
 };

 AVCodec asv2_decoder = {
@ -628,7 +628,7 @@ AVCodec asv2_decoder = {
    decode_end,
    decode_frame,
    CODEC_CAP_DR1,
-    .long_name= "ASUS V2",
+    .long_name= NULL_IF_CONFIG_SMALL("ASUS V2"),
 };

 #ifdef CONFIG_ENCODERS
@ -642,7 +642,7 @@ AVCodec asv1_encoder = {
    encode_frame,
    //encode_end,
    .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE},
-    .long_name= "ASUS V1",
+    .long_name= NULL_IF_CONFIG_SMALL("ASUS V1"),
 };

 AVCodec asv2_encoder = {
@ -654,7 +654,7 @@ AVCodec asv2_encoder = {
    encode_frame,
    //encode_end,
    .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE},
-    .long_name= "ASUS V2",
+    .long_name= NULL_IF_CONFIG_SMALL("ASUS V2"),
 };

 #endif //CONFIG_ENCODERS
--- a/libavcodec/atrac3.c
+++ b/libavcodec/atrac3.c
@ -1071,5 +1071,5 @@ AVCodec atrac3_decoder =
    .init = atrac3_decode_init,
    .close = atrac3_decode_close,
    .decode = atrac3_decode_frame,
-    .long_name = "Atrac 3 (Adaptive TRansform Acoustic Coding 3)",
+    .long_name = NULL_IF_CONFIG_SMALL("Atrac 3 (Adaptive TRansform Acoustic Coding 3)"),
 };
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@ -2245,7 +2245,11 @@ typedef struct AVCodec {
    void (*flush)(AVCodecContext *);
    const AVRational *supported_framerates; ///< array of supported framerates, or NULL if any, array is terminated by {0,0}
    const enum PixelFormat *pix_fmts;       ///< array of supported pixel formats, or NULL if unknown, array is terminated by -1
-    const char *long_name;                  ///< descriptive name for the codec, meant to be more human readable than \p name
+    /**
+     * Descriptive name for the codec, meant to be more human readable than \p name.
+     * You \e should use the NULL_IF_CONFIG_SMALL() macro to define it.
+     */
+    const char *long_name;
    const int *supported_samplerates;       ///< array of supported audio samplerates, or NULL if unknown, array is terminated by 0
 } AVCodec;

--- a/libavcodec/avs.c
+++ b/libavcodec/avs.c
@ -158,5 +158,5 @@ AVCodec avs_decoder = {
    NULL,
    avs_decode_frame,
    CODEC_CAP_DR1,
-    .long_name = "AVS (Audio Video Standard) video",
+    .long_name = NULL_IF_CONFIG_SMALL("AVS (Audio Video Standard) video"),
 };
--- a/libavcodec/bethsoftvideo.c
+++ b/libavcodec/bethsoftvideo.c
@ -136,5 +136,5 @@ AVCodec bethsoftvid_decoder = {
    .init = bethsoftvid_decode_init,
    .close = bethsoftvid_decode_end,
    .decode = bethsoftvid_decode_frame,
-    .long_name = "Bethesda VID video",
+    .long_name = NULL_IF_CONFIG_SMALL("Bethesda VID video"),
 };
--- a/libavcodec/bfi.c
+++ b/libavcodec/bfi.c
@ -178,5 +178,5 @@ AVCodec bfi_decoder = {
    .init = bfi_decode_init,
    .close = bfi_decode_close,
    .decode = bfi_decode_frame,
-    .long_name = "Brute Force & Ignorance",
+    .long_name = NULL_IF_CONFIG_SMALL("Brute Force & Ignorance"),
 };
--- a/libavcodec/bmp.c
+++ b/libavcodec/bmp.c
@ -258,5 +258,5 @@ AVCodec bmp_decoder = {
    NULL,
    bmp_decode_end,
    bmp_decode_frame,
-    .long_name = "BMP image",
+    .long_name = NULL_IF_CONFIG_SMALL("BMP image"),
 };
--- a/libavcodec/bmpenc.c
+++ b/libavcodec/bmpenc.c
@ -95,5 +95,5 @@ AVCodec bmp_encoder = {
    bmp_encode_frame,
    NULL, //encode_end,
    .pix_fmts= (enum PixelFormat[]){PIX_FMT_BGR24, PIX_FMT_NONE},
-    .long_name = "BMP image",
+    .long_name = NULL_IF_CONFIG_SMALL("BMP image"),
 };
--- a/libavcodec/c93.c
+++ b/libavcodec/c93.c
@ -250,5 +250,5 @@ AVCodec c93_decoder = {
    decode_end,
    decode_frame,
    CODEC_CAP_DR1,
-    .long_name = "Interplay C93",
+    .long_name = NULL_IF_CONFIG_SMALL("Interplay C93"),
 };
--- a/libavcodec/cavsdec.c
+++ b/libavcodec/cavsdec.c
@ -699,5 +699,5 @@ AVCodec cavs_decoder = {
    cavs_decode_frame,
    CODEC_CAP_DR1 | CODEC_CAP_DELAY,
    .flush= cavs_flush,
-    .long_name= "Chinese AVS video (AVS1-P2, JiZhun profile)",
+    .long_name= NULL_IF_CONFIG_SMALL("Chinese AVS video (AVS1-P2, JiZhun profile)"),
 };
--- a/libavcodec/cinepak.c
+++ b/libavcodec/cinepak.c
@ -463,5 +463,5 @@ AVCodec cinepak_decoder = {
    cinepak_decode_end,
    cinepak_decode_frame,
    CODEC_CAP_DR1,
-    .long_name = "Cinepak",
+    .long_name = NULL_IF_CONFIG_SMALL("Cinepak"),
 };
--- a/libavcodec/cljr.c
+++ b/libavcodec/cljr.c
@ -140,7 +140,7 @@ AVCodec cljr_decoder = {
    NULL,
    decode_frame,
    CODEC_CAP_DR1,
-    .long_name = "Cirrus Logic AccuPak",
+    .long_name = NULL_IF_CONFIG_SMALL("Cirrus Logic AccuPak"),
 };
 #if 0
 #ifdef CONFIG_ENCODERS
@ -153,7 +153,7 @@ AVCodec cljr_encoder = {
    encode_init,
    encode_frame,
    //encode_end,
-    .long_name = "Cirrus Logic AccuPak",
+    .long_name = NULL_IF_CONFIG_SMALL("Cirrus Logic AccuPak"),
 };

 #endif //CONFIG_ENCODERS
--- a/libavcodec/cook.c
+++ b/libavcodec/cook.c
@ -1195,5 +1195,5 @@ AVCodec cook_decoder =
    .init = cook_decode_init,
    .close = cook_decode_close,
    .decode = cook_decode_frame,
-    .long_name = "COOK",
+    .long_name = NULL_IF_CONFIG_SMALL("COOK"),
 };
--- a/libavcodec/cscd.c
+++ b/libavcodec/cscd.c
@ -258,6 +258,6 @@ AVCodec cscd_decoder = {
    decode_end,
    decode_frame,
    CODEC_CAP_DR1,
-    .long_name = "CamStudio",
+    .long_name = NULL_IF_CONFIG_SMALL("CamStudio"),
 };

--- a/libavcodec/cyuv.c
+++ b/libavcodec/cyuv.c
@ -181,6 +181,6 @@ AVCodec cyuv_decoder = {
    cyuv_decode_frame,
    CODEC_CAP_DR1,
    NULL,
-    .long_name = "Creative YUV (CYUV)",
+    .long_name = NULL_IF_CONFIG_SMALL("Creative YUV (CYUV)"),
 };

--- a/libavcodec/dca.c
+++ b/libavcodec/dca.c
@ -1264,5 +1264,5 @@ AVCodec dca_decoder = {
    .priv_data_size = sizeof(DCAContext),
    .init = dca_decode_init,
    .decode = dca_decode_frame,
-    .long_name = "DCA (DTS Coherent Acoustics)",
+    .long_name = NULL_IF_CONFIG_SMALL("DCA (DTS Coherent Acoustics)"),
 };
--- a/libavcodec/dnxhddec.c
+++ b/libavcodec/dnxhddec.c
@ -342,5 +342,5 @@ AVCodec dnxhd_decoder = {
    dnxhd_decode_close,
    dnxhd_decode_frame,
    CODEC_CAP_DR1,
-    .long_name = "VC3/DNxHD",
+    .long_name = NULL_IF_CONFIG_SMALL("VC3/DNxHD"),
 };
--- a/libavcodec/dnxhdenc.c
+++ b/libavcodec/dnxhdenc.c
@ -857,5 +857,5 @@ AVCodec dnxhd_encoder = {
    dnxhd_encode_picture,
    dnxhd_encode_end,
    .pix_fmts = (enum PixelFormat[]){PIX_FMT_YUV422P, PIX_FMT_NONE},
-    .long_name = "VC3/DNxHD",
+    .long_name = NULL_IF_CONFIG_SMALL("VC3/DNxHD"),
 };
--- a/libavcodec/dpcm.c
+++ b/libavcodec/dpcm.c
@ -304,7 +304,7 @@ AVCodec name ## _decoder = {                    \
    NULL,                                       \
    NULL,                                       \
    dpcm_decode_frame,                          \
-    .long_name = long_name_,                    \
+    .long_name = NULL_IF_CONFIG_SMALL(long_name_), \
 };

 DPCM_DECODER(CODEC_ID_INTERPLAY_DPCM, interplay_dpcm, "Interplay DPCM");
--- a/libavcodec/dsicinav.c
+++ b/libavcodec/dsicinav.c
@ -348,7 +348,7 @@ AVCodec dsicinvideo_decoder = {
    cinvideo_decode_end,
    cinvideo_decode_frame,
    CODEC_CAP_DR1,
-    .long_name = "Delphine Software International CIN video",
+    .long_name = NULL_IF_CONFIG_SMALL("Delphine Software International CIN video"),
 };

 AVCodec dsicinaudio_decoder = {
@ -360,5 +360,5 @@ AVCodec dsicinaudio_decoder = {
    NULL,
    NULL,
    cinaudio_decode_frame,
-    .long_name = "Delphine Software International CIN audio",
+    .long_name = NULL_IF_CONFIG_SMALL("Delphine Software International CIN audio"),
 };
--- a/libavcodec/dv.c
+++ b/libavcodec/dv.c
@ -1236,7 +1236,7 @@ AVCodec dvvideo_encoder = {
    dvvideo_init,
    dvvideo_encode_frame,
    .pix_fmts = (enum PixelFormat[]) {PIX_FMT_YUV411P, PIX_FMT_YUV422P, PIX_FMT_YUV420P, PIX_FMT_NONE},
-    .long_name = "DV (Digital Video)",
+    .long_name = NULL_IF_CONFIG_SMALL("DV (Digital Video)"),
 };
 #endif // CONFIG_DVVIDEO_ENCODER

@ -1252,6 +1252,6 @@ AVCodec dvvideo_decoder = {
    dvvideo_decode_frame,
    CODEC_CAP_DR1,
    NULL,
-    .long_name = "DV (Digital Video)",
+    .long_name = NULL_IF_CONFIG_SMALL("DV (Digital Video)"),
 };
 #endif
--- a/libavcodec/dvbsub.c
+++ b/libavcodec/dvbsub.c
@ -408,5 +408,5 @@ AVCodec dvbsub_encoder = {
    sizeof(DVBSubtitleContext),
    NULL,
    dvbsub_encode,
-    .long_name = "DVB subtitles",
+    .long_name = NULL_IF_CONFIG_SMALL("DVB subtitles"),
 };
--- a/libavcodec/dvbsubdec.c
+++ b/libavcodec/dvbsubdec.c
@ -1430,5 +1430,5 @@ AVCodec dvbsub_decoder = {
    NULL,
    dvbsub_close_decoder,
    dvbsub_decode,
-    .long_name = "DVB subtitles",
+    .long_name = NULL_IF_CONFIG_SMALL("DVB subtitles"),
 };
--- a/libavcodec/dvdsubdec.c
+++ b/libavcodec/dvdsubdec.c
@ -506,5 +506,5 @@ AVCodec dvdsub_decoder = {
    NULL,
    NULL,
    dvdsub_decode,
-    .long_name = "DVD subtitles",
+    .long_name = NULL_IF_CONFIG_SMALL("DVD subtitles"),
 };
--- a/libavcodec/dvdsubenc.c
+++ b/libavcodec/dvdsubenc.c
@ -222,5 +222,5 @@ AVCodec dvdsub_encoder = {
    0,
    NULL,
    dvdsub_encode,
-    .long_name = "DVD subtitles",
+    .long_name = NULL_IF_CONFIG_SMALL("DVD subtitles"),
 };
--- a/libavcodec/dxa.c
+++ b/libavcodec/dxa.c
@ -327,6 +327,6 @@ AVCodec dxa_decoder = {
    NULL,
    decode_end,
    decode_frame,
-    .long_name = "Feeble Files/ScummVM DXA",
+    .long_name = NULL_IF_CONFIG_SMALL("Feeble Files/ScummVM DXA"),
 };

--- a/libavcodec/escape124.c
+++ b/libavcodec/escape124.c
@ -380,6 +380,6 @@ AVCodec escape124_decoder = {
    escape124_decode_close,
    escape124_decode_frame,
    CODEC_CAP_DR1,
-    .long_name = "Escape 124",
+    .long_name = NULL_IF_CONFIG_SMALL("Escape 124"),
 };

--- a/libavcodec/ffv1.c
+++ b/libavcodec/ffv1.c
@ -1026,7 +1026,7 @@ AVCodec ffv1_decoder = {
    decode_frame,
    CODEC_CAP_DR1 /*| CODEC_CAP_DRAW_HORIZ_BAND*/,
    NULL,
-    .long_name= "FFmpeg codec #1",
+    .long_name= NULL_IF_CONFIG_SMALL("FFmpeg codec #1"),
 };

 #ifdef CONFIG_ENCODERS
@ -1039,6 +1039,6 @@ AVCodec ffv1_encoder = {
    encode_frame,
    common_end,
    .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_YUV444P, PIX_FMT_YUV422P, PIX_FMT_YUV411P, PIX_FMT_YUV410P, PIX_FMT_RGB32, PIX_FMT_NONE},
-    .long_name= "FFmpeg codec #1",
+    .long_name= NULL_IF_CONFIG_SMALL("FFmpeg codec #1"),
 };
 #endif
--- a/libavcodec/flac.c
+++ b/libavcodec/flac.c
@ -774,5 +774,5 @@ AVCodec flac_decoder = {
    flac_decode_close,
    flac_decode_frame,
    .flush= flac_flush,
-    .long_name= "FLAC (Free Lossless Audio Codec)"
+    .long_name= NULL_IF_CONFIG_SMALL("FLAC (Free Lossless Audio Codec)"),
 };
--- a/libavcodec/flacenc.c
+++ b/libavcodec/flacenc.c
@ -1492,5 +1492,5 @@ AVCodec flac_encoder = {
    flac_encode_close,
    NULL,
    .capabilities = CODEC_CAP_SMALL_LAST_FRAME,
-    .long_name = "FLAC (Free Lossless Audio Codec)",
+    .long_name = NULL_IF_CONFIG_SMALL("FLAC (Free Lossless Audio Codec)"),
 };
--- a/libavcodec/flashsv.c
+++ b/libavcodec/flashsv.c
@ -255,5 +255,5 @@ AVCodec flashsv_decoder = {
    flashsv_decode_frame,
    CODEC_CAP_DR1,
    .pix_fmts = (enum PixelFormat[]){PIX_FMT_BGR24, PIX_FMT_NONE},
-    .long_name = "Flash Screen Video v1",
+    .long_name = NULL_IF_CONFIG_SMALL("Flash Screen Video v1"),
 };
--- a/libavcodec/flashsvenc.c
+++ b/libavcodec/flashsvenc.c
@ -293,6 +293,6 @@ AVCodec flashsv_encoder = {
    flashsv_encode_frame,
    flashsv_encode_end,
    .pix_fmts = (enum PixelFormat[]){PIX_FMT_BGR24, PIX_FMT_NONE},
-    .long_name = "Flash Screen Video",
+    .long_name = NULL_IF_CONFIG_SMALL("Flash Screen Video"),
 };

--- a/libavcodec/flicvideo.c
+++ b/libavcodec/flicvideo.c
@ -750,5 +750,5 @@ AVCodec flic_decoder = {
    NULL,
    NULL,
    NULL,
-    .long_name = "Autodesk Animator Flic video",
+    .long_name = NULL_IF_CONFIG_SMALL("Autodesk Animator Flic video"),
 };
--- a/libavcodec/fraps.c
+++ b/libavcodec/fraps.c
@ -365,5 +365,5 @@ AVCodec fraps_decoder = {
    decode_end,
    decode_frame,
    CODEC_CAP_DR1,
-    .long_name = "Fraps",
+    .long_name = NULL_IF_CONFIG_SMALL("Fraps"),
 };
--- a/libavcodec/g726.c
+++ b/libavcodec/g726.c
@ -413,7 +413,7 @@ AVCodec adpcm_g726_encoder = {
    g726_encode_frame,
    g726_close,
    NULL,
-    .long_name = "G.726 ADPCM",
+    .long_name = NULL_IF_CONFIG_SMALL("G.726 ADPCM"),
 };
 #endif //CONFIG_ENCODERS

@ -426,5 +426,5 @@ AVCodec adpcm_g726_decoder = {
    NULL,
    g726_close,
    g726_decode_frame,
-    .long_name = "G.726 ADPCM",
+    .long_name = NULL_IF_CONFIG_SMALL("G.726 ADPCM"),
 };
--- a/libavcodec/gif.c
+++ b/libavcodec/gif.c
@ -341,5 +341,5 @@ AVCodec gif_encoder = {
    gif_encode_frame,
    NULL, //encode_end,
    .pix_fmts= (enum PixelFormat[]){PIX_FMT_PAL8, PIX_FMT_NONE},
-    .long_name= "GIF (Graphics Interchange Format)",
+    .long_name= NULL_IF_CONFIG_SMALL("GIF (Graphics Interchange Format)"),
 };
--- a/libavcodec/gifdec.c
+++ b/libavcodec/gifdec.c
@ -333,5 +333,5 @@ AVCodec gif_decoder = {
    NULL,
    gif_decode_close,
    gif_decode_frame,
-    .long_name = "GIF (Graphics Interchange Format)",
+    .long_name = NULL_IF_CONFIG_SMALL("GIF (Graphics Interchange Format)"),
 };
--- a/libavcodec/h261dec.c
+++ b/libavcodec/h261dec.c
@ -647,5 +647,5 @@ AVCodec h261_decoder = {
    h261_decode_end,
    h261_decode_frame,
    CODEC_CAP_DR1,
-    .long_name = "H.261",
+    .long_name = NULL_IF_CONFIG_SMALL("H.261"),
 };
--- a/libavcodec/h261enc.c
+++ b/libavcodec/h261enc.c
@ -330,6 +330,6 @@ AVCodec h261_encoder = {
    MPV_encode_picture,
    MPV_encode_end,
    .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE},
-    .long_name= "H.261",
+    .long_name= NULL_IF_CONFIG_SMALL("H.261"),
 };

--- a/libavcodec/h263dec.c
+++ b/libavcodec/h263dec.c
@ -723,7 +723,7 @@ AVCodec mpeg4_decoder = {
    ff_h263_decode_frame,
    CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED | CODEC_CAP_DELAY,
    .flush= ff_mpeg_flush,
-    .long_name= "MPEG-4 part 2",
+    .long_name= NULL_IF_CONFIG_SMALL("MPEG-4 part 2"),
 };

 AVCodec h263_decoder = {
@ -737,7 +737,7 @@ AVCodec h263_decoder = {
    ff_h263_decode_frame,
    CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED | CODEC_CAP_DELAY,
    .flush= ff_mpeg_flush,
-    .long_name="H.263",
+    .long_name= NULL_IF_CONFIG_SMALL("H.263"),
 };

 AVCodec msmpeg4v1_decoder = {
@ -750,7 +750,7 @@ AVCodec msmpeg4v1_decoder = {
    ff_h263_decode_end,
    ff_h263_decode_frame,
    CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1,
-    .long_name="MPEG-4 part 2 Microsoft variant version 1",
+    .long_name= NULL_IF_CONFIG_SMALL("MPEG-4 part 2 Microsoft variant version 1"),
 };

 AVCodec msmpeg4v2_decoder = {
@ -763,7 +763,7 @@ AVCodec msmpeg4v2_decoder = {
    ff_h263_decode_end,
    ff_h263_decode_frame,
    CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1,
-    .long_name="MPEG-4 part 2 Microsoft variant version 2",
+    .long_name= NULL_IF_CONFIG_SMALL("MPEG-4 part 2 Microsoft variant version 2"),
 };

 AVCodec msmpeg4v3_decoder = {
@ -776,7 +776,7 @@ AVCodec msmpeg4v3_decoder = {
    ff_h263_decode_end,
    ff_h263_decode_frame,
    CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1,
-    .long_name="MPEG-4 part 2 Microsoft variant version 3",
+    .long_name= NULL_IF_CONFIG_SMALL("MPEG-4 part 2 Microsoft variant version 3"),
 };

 AVCodec wmv1_decoder = {
@ -789,7 +789,7 @@ AVCodec wmv1_decoder = {
    ff_h263_decode_end,
    ff_h263_decode_frame,
    CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1,
-    .long_name= "Windows Media Video 7",
+    .long_name= NULL_IF_CONFIG_SMALL("Windows Media Video 7"),
 };

 AVCodec h263i_decoder = {
@ -802,7 +802,7 @@ AVCodec h263i_decoder = {
    ff_h263_decode_end,
    ff_h263_decode_frame,
    CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1,
-    .long_name = "H.263i",
+    .long_name = NULL_IF_CONFIG_SMALL("H.263i"),
 };

 AVCodec flv_decoder = {
@ -815,5 +815,5 @@ AVCodec flv_decoder = {
    ff_h263_decode_end,
    ff_h263_decode_frame,
    CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1,
-    .long_name= "Flash Video",
+    .long_name= NULL_IF_CONFIG_SMALL("Flash Video"),
 };
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@ -8100,7 +8100,7 @@ AVCodec h264_decoder = {
    decode_frame,
    /*CODEC_CAP_DRAW_HORIZ_BAND |*/ CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED | CODEC_CAP_DELAY,
    .flush= flush_dpb,
-    .long_name = "H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10",
+    .long_name = NULL_IF_CONFIG_SMALL("H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10"),
 };

 #include "svq3.c"
--- a/libavcodec/huffyuv.c
+++ b/libavcodec/huffyuv.c
@ -1445,7 +1445,7 @@ AVCodec huffyuv_decoder = {
    decode_frame,
    CODEC_CAP_DR1 | CODEC_CAP_DRAW_HORIZ_BAND,
    NULL,
-    .long_name = "Huffyuv / HuffYUV",
+    .long_name = NULL_IF_CONFIG_SMALL("Huffyuv / HuffYUV"),
 };

 AVCodec ffvhuff_decoder = {
@ -1459,7 +1459,7 @@ AVCodec ffvhuff_decoder = {
    decode_frame,
    CODEC_CAP_DR1 | CODEC_CAP_DRAW_HORIZ_BAND,
    NULL,
-    .long_name = "Huffyuv FFmpeg variant",
+    .long_name = NULL_IF_CONFIG_SMALL("Huffyuv FFmpeg variant"),
 };
 #endif

@ -1474,7 +1474,7 @@ AVCodec huffyuv_encoder = {
    encode_frame,
    encode_end,
    .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV422P, PIX_FMT_RGB32, PIX_FMT_NONE},
-    .long_name = "Huffyuv / HuffYUV",
+    .long_name = NULL_IF_CONFIG_SMALL("Huffyuv / HuffYUV"),
 };

 AVCodec ffvhuff_encoder = {
@ -1486,7 +1486,7 @@ AVCodec ffvhuff_encoder = {
    encode_frame,
    encode_end,
    .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_YUV422P, PIX_FMT_RGB32, PIX_FMT_NONE},
-    .long_name = "Huffyuv FFmpeg variant",
+    .long_name = NULL_IF_CONFIG_SMALL("Huffyuv FFmpeg variant"),
 };

 #endif //CONFIG_ENCODERS
--- a/libavcodec/idcinvideo.c
+++ b/libavcodec/idcinvideo.c
@ -262,6 +262,6 @@ AVCodec idcin_decoder = {
    idcin_decode_end,
    idcin_decode_frame,
    CODEC_CAP_DR1,
-    .long_name = "id Quake II CIN video",
+    .long_name = NULL_IF_CONFIG_SMALL("id Quake II CIN video"),
 };

--- a/libavcodec/imc.c
+++ b/libavcodec/imc.c
@ -813,5 +813,5 @@ AVCodec imc_decoder = {
    .init = imc_decode_init,
    .close = imc_decode_close,
    .decode = imc_decode_frame,
-    .long_name = "IMC (Intel Music Coder)",
+    .long_name = NULL_IF_CONFIG_SMALL("IMC (Intel Music Coder)"),
 };
--- a/libavcodec/indeo2.c
+++ b/libavcodec/indeo2.c
@ -219,5 +219,5 @@ AVCodec indeo2_decoder = {
    NULL,
    ir2_decode_frame,
    CODEC_CAP_DR1,
-    .long_name = "Intel Indeo 2",
+    .long_name = NULL_IF_CONFIG_SMALL("Intel Indeo 2"),
 };
--- a/libavcodec/indeo3.c
+++ b/libavcodec/indeo3.c
@ -1135,5 +1135,5 @@ AVCodec indeo3_decoder = {
    indeo3_decode_frame,
    0,
    NULL,
-    .long_name = "Intel Indeo 3",
+    .long_name = NULL_IF_CONFIG_SMALL("Intel Indeo 3"),
 };
--- a/libavcodec/interplayvideo.c
+++ b/libavcodec/interplayvideo.c
@ -942,5 +942,5 @@ AVCodec interplay_video_decoder = {
    ipvideo_decode_end,
    ipvideo_decode_frame,
    CODEC_CAP_DR1,
-    .long_name = "Interplay MVE Video",
+    .long_name = NULL_IF_CONFIG_SMALL("Interplay MVE Video"),
 };
--- a/libavcodec/jpeglsdec.c
+++ b/libavcodec/jpeglsdec.c
@ -372,5 +372,5 @@ AVCodec jpegls_decoder = {
    ff_mjpeg_decode_end,
    ff_mjpeg_decode_frame,
    CODEC_CAP_DR1,
-    .long_name = "JPEG-LS",
+    .long_name = NULL_IF_CONFIG_SMALL("JPEG-LS"),
 };
--- a/libavcodec/jpeglsenc.c
+++ b/libavcodec/jpeglsenc.c
@ -390,5 +390,5 @@ AVCodec jpegls_encoder = { //FIXME avoid MPV_* lossless JPEG should not need the
    encode_picture_ls,
    NULL,
    .pix_fmts= (enum PixelFormat[]){PIX_FMT_BGR24, PIX_FMT_RGB24, PIX_FMT_GRAY8, PIX_FMT_GRAY16, PIX_FMT_NONE},
-    .long_name= "JPEG-LS",
+    .long_name= NULL_IF_CONFIG_SMALL("JPEG-LS"),
 };
--- a/libavcodec/kmvc.c
+++ b/libavcodec/kmvc.c
@ -411,5 +411,5 @@ AVCodec kmvc_decoder = {
    NULL,
    decode_end,
    decode_frame,
-    .long_name = "Karl Morton's video codec",
+    .long_name = NULL_IF_CONFIG_SMALL("Karl Morton's video codec"),
 };
--- a/libavcodec/lcldec.c
+++ b/libavcodec/lcldec.c
@ -697,7 +697,7 @@ AVCodec mszh_decoder = {
    decode_end,
    decode_frame,
    CODEC_CAP_DR1,
-    .long_name ="LCL (LossLess Codec Library) MSZH",
+    .long_name = NULL_IF_CONFIG_SMALL("LCL (LossLess Codec Library) MSZH"),
 };
 #endif

@ -712,6 +712,6 @@ AVCodec zlib_decoder = {
    decode_end,
    decode_frame,
    CODEC_CAP_DR1,
-    .long_name ="LCL (LossLess Codec Library) ZLIB",
+    .long_name = NULL_IF_CONFIG_SMALL("LCL (LossLess Codec Library) ZLIB"),
 };
 #endif
--- a/libavcodec/lclenc.c
+++ b/libavcodec/lclenc.c
@ -228,5 +228,5 @@ AVCodec zlib_encoder = {
    encode_init,
    encode_frame,
    encode_end,
-    .long_name = "LCL (LossLess Codec Library) ZLIB",
+    .long_name = NULL_IF_CONFIG_SMALL("LCL (LossLess Codec Library) ZLIB"),
 };
--- a/libavcodec/liba52.c
+++ b/libavcodec/liba52.c
@ -222,5 +222,5 @@ AVCodec liba52_decoder = {
    NULL,
    a52_decode_end,
    a52_decode_frame,
-    .long_name = "liba52 ATSC A/52 / AC-3",
+    .long_name = NULL_IF_CONFIG_SMALL("liba52 ATSC A/52 / AC-3"),
 };
--- a/libavcodec/libamr.c
+++ b/libavcodec/libamr.c
@ -503,7 +503,7 @@ AVCodec libamr_nb_decoder =
    NULL,
    amr_nb_decode_close,
    amr_nb_decode_frame,
-    .long_name = "libamr-nb Adaptive Multi-Rate (AMR) Narrow-Band",
+    .long_name = NULL_IF_CONFIG_SMALL("libamr-nb Adaptive Multi-Rate (AMR) Narrow-Band"),
 };

 AVCodec libamr_nb_encoder =
@ -516,7 +516,7 @@ AVCodec libamr_nb_encoder =
    amr_nb_encode_frame,
    amr_nb_encode_close,
    NULL,
-    .long_name = "libamr-nb Adaptive Multi-Rate (AMR) Narrow-Band",
+    .long_name = NULL_IF_CONFIG_SMALL("libamr-nb Adaptive Multi-Rate (AMR) Narrow-Band"),
 };

 #endif
@ -697,7 +697,7 @@ AVCodec libamr_wb_decoder =
    NULL,
    amr_wb_decode_close,
    amr_wb_decode_frame,
-    .long_name = "libamr-wb Adaptive Multi-Rate (AMR) Wide-Band",
+    .long_name = NULL_IF_CONFIG_SMALL("libamr-wb Adaptive Multi-Rate (AMR) Wide-Band"),
 };

 AVCodec libamr_wb_encoder =
@ -710,7 +710,7 @@ AVCodec libamr_wb_encoder =
    amr_wb_encode_frame,
    amr_wb_encode_close,
    NULL,
-    .long_name = "libamr-wb Adaptive Multi-Rate (AMR) Wide-Band",
+    .long_name = NULL_IF_CONFIG_SMALL("libamr-wb Adaptive Multi-Rate (AMR) Wide-Band"),
 };

 #endif //CONFIG_LIBAMR_WB
--- a/libavcodec/libdiracdec.c
+++ b/libavcodec/libdiracdec.c
@ -205,5 +205,5 @@ AVCodec libdirac_decoder = {
    libdirac_decode_frame,
    CODEC_CAP_DELAY,
    .flush = libdirac_flush,
-    .long_name = "libdirac Dirac 2.2",
+    .long_name = NULL_IF_CONFIG_SMALL("libdirac Dirac 2.2"),
 } ;
--- a/libavcodec/libdiracenc.c
+++ b/libavcodec/libdiracenc.c
@ -370,5 +370,5 @@ AVCodec libdirac_encoder = {
    libdirac_encode_close,
   .capabilities= CODEC_CAP_DELAY,
   .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_YUV422P, PIX_FMT_YUV444P, -1},
-   .long_name= "libdirac Dirac 2.2",
+   .long_name= NULL_IF_CONFIG_SMALL("libdirac Dirac 2.2"),
 } ;
--- a/libavcodec/libfaac.c
+++ b/libavcodec/libfaac.c
@ -151,5 +151,5 @@ AVCodec libfaac_encoder = {
    Faac_encode_init,
    Faac_encode_frame,
    Faac_encode_close,
-    .long_name = "libfaac AAC (Advanced Audio Codec)",
+    .long_name = NULL_IF_CONFIG_SMALL("libfaac AAC (Advanced Audio Codec)"),
 };
--- a/libavcodec/libfaad.c
+++ b/libavcodec/libfaad.c
@ -325,7 +325,7 @@ AVCodec name ## _decoder = {    \
    NULL,                       \
    faac_decode_end,            \
    faac_decode_frame,          \
-    .long_name = long_name_,    \
+    .long_name = NULL_IF_CONFIG_SMALL(long_name_), \
 }

 // FIXME - raw AAC files - maybe just one entry will be enough
--- a/libavcodec/libgsm.c
+++ b/libavcodec/libgsm.c
@ -117,7 +117,7 @@ AVCodec libgsm_encoder = {
    libgsm_init,
    libgsm_encode_frame,
    libgsm_close,
-    .long_name = "libgsm GSM",
+    .long_name = NULL_IF_CONFIG_SMALL("libgsm GSM"),
 };

 AVCodec libgsm_ms_encoder = {
@ -128,7 +128,7 @@ AVCodec libgsm_ms_encoder = {
    libgsm_init,
    libgsm_encode_frame,
    libgsm_close,
-    .long_name = "libgsm GSM Microsoft variant",
+    .long_name = NULL_IF_CONFIG_SMALL("libgsm GSM Microsoft variant"),
 };

 static int libgsm_decode_frame(AVCodecContext *avctx,
@ -158,7 +158,7 @@ AVCodec libgsm_decoder = {
    NULL,
    libgsm_close,
    libgsm_decode_frame,
-    .long_name = "libgsm GSM",
+    .long_name = NULL_IF_CONFIG_SMALL("libgsm GSM"),
 };

 AVCodec libgsm_ms_decoder = {
@ -170,5 +170,5 @@ AVCodec libgsm_ms_decoder = {
    NULL,
    libgsm_close,
    libgsm_decode_frame,
-    .long_name = "libgsm GSM Microsoft variant",
+    .long_name = NULL_IF_CONFIG_SMALL("libgsm GSM Microsoft variant"),
 };
--- a/libavcodec/libmp3lame.c
+++ b/libavcodec/libmp3lame.c
@ -218,5 +218,5 @@ AVCodec libmp3lame_encoder = {
    MP3lame_encode_frame,
    MP3lame_encode_close,
    .capabilities= CODEC_CAP_DELAY,
-    .long_name= "libmp3lame MP3 (MPEG audio layer 3)",
+    .long_name= NULL_IF_CONFIG_SMALL("libmp3lame MP3 (MPEG audio layer 3)"),
 };
--- a/libavcodec/libschroedingerdec.c
+++ b/libavcodec/libschroedingerdec.c
@ -305,5 +305,5 @@ AVCodec libschroedinger_decoder = {
    libschroedinger_decode_frame,
    CODEC_CAP_DELAY,
    .flush = libschroedinger_flush,
-    .long_name = "libschroedinger Dirac 2.2",
+    .long_name = NULL_IF_CONFIG_SMALL("libschroedinger Dirac 2.2"),
 };
--- a/libavcodec/libschroedingerenc.c
+++ b/libavcodec/libschroedingerenc.c
@ -384,5 +384,5 @@ AVCodec libschroedinger_encoder = {
    libschroedinger_encode_close,
   .capabilities= CODEC_CAP_DELAY,
   .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_YUV422P, PIX_FMT_YUV444P, PIX_FMT_NONE},
-   .long_name= "libschroedinger Dirac 2.2",
+   .long_name= NULL_IF_CONFIG_SMALL("libschroedinger Dirac 2.2"),
 };
--- a/libavcodec/libtheoraenc.c
+++ b/libavcodec/libtheoraenc.c
@ -277,5 +277,5 @@ AVCodec libtheora_encoder =
    .close = encode_close,
    .encode = encode_frame,
    .pix_fmts = supported_pixel_formats,
-    .long_name = "libtheora Theora",
+    .long_name = NULL_IF_CONFIG_SMALL("libtheora Theora"),
 };
--- a/libavcodec/libvorbis.c
+++ b/libavcodec/libvorbis.c
@ -217,5 +217,5 @@ AVCodec libvorbis_encoder = {
    oggvorbis_encode_frame,
    oggvorbis_encode_close,
    .capabilities= CODEC_CAP_DELAY,
-    .long_name= "libvorbis Vorbis",
+    .long_name= NULL_IF_CONFIG_SMALL("libvorbis Vorbis"),
 } ;
--- a/libavcodec/libx264.c
+++ b/libavcodec/libx264.c
@ -301,5 +301,5 @@ AVCodec libx264_encoder = {
    .close = X264_close,
    .capabilities = CODEC_CAP_DELAY,
    .pix_fmts = (enum PixelFormat[]) { PIX_FMT_YUV420P, PIX_FMT_NONE },
-    .long_name = "libx264 H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10",
+    .long_name = NULL_IF_CONFIG_SMALL("libx264 H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10"),
 };
--- a/libavcodec/libxvidff.c
+++ b/libavcodec/libxvidff.c
@ -778,5 +778,5 @@ AVCodec libxvid_encoder = {
    ff_xvid_encode_frame,
    ff_xvid_encode_close,
    .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE},
-    .long_name= "libxvidcore MPEG-4 part 2",
+    .long_name= NULL_IF_CONFIG_SMALL("libxvidcore MPEG-4 part 2"),
 };
--- a/libavcodec/ljpegenc.c
+++ b/libavcodec/ljpegenc.c
@ -194,5 +194,5 @@ AVCodec ljpeg_encoder = { //FIXME avoid MPV_* lossless JPEG should not need them
    MPV_encode_init,
    encode_picture_lossless,
    MPV_encode_end,
-    .long_name = "Lossless JPEG",
+    .long_name = NULL_IF_CONFIG_SMALL("Lossless JPEG"),
 };
--- a/libavcodec/loco.c
+++ b/libavcodec/loco.c
@ -282,5 +282,5 @@ AVCodec loco_decoder = {
    NULL,
    decode_frame,
    CODEC_CAP_DR1,
-    .long_name = "LOCO",
+    .long_name = NULL_IF_CONFIG_SMALL("LOCO"),
 };
--- a/libavcodec/mace.c
+++ b/libavcodec/mace.c
@ -437,7 +437,7 @@ AVCodec mace3_decoder = {
    NULL,
    NULL,
    mace_decode_frame,
-    .long_name = "MACE (Macintosh Audio Compression/Expansion) 3:1",
+    .long_name = NULL_IF_CONFIG_SMALL("MACE (Macintosh Audio Compression/Expansion) 3:1"),
 };

 AVCodec mace6_decoder = {
@ -449,6 +449,6 @@ AVCodec mace6_decoder = {
    NULL,
    NULL,
    mace_decode_frame,
-    .long_name = "MACE (Macintosh Audio Compression/Expansion) 6:1",
+    .long_name = NULL_IF_CONFIG_SMALL("MACE (Macintosh Audio Compression/Expansion) 6:1"),
 };

--- a/libavcodec/mdec.c
+++ b/libavcodec/mdec.c
@ -267,6 +267,6 @@ AVCodec mdec_decoder = {
    decode_end,
    decode_frame,
    CODEC_CAP_DR1,
-    .long_name="Sony PlayStation MDEC (Motion DECoder)",
+    .long_name= NULL_IF_CONFIG_SMALL("Sony PlayStation MDEC (Motion DECoder)"),
 };

--- a/libavcodec/mimic.c
+++ b/libavcodec/mimic.c
@ -386,5 +386,5 @@ AVCodec mimic_decoder = {
    mimic_decode_end,
    mimic_decode_frame,
    CODEC_CAP_DR1,
-    .long_name = "Mimic",
+    .long_name = NULL_IF_CONFIG_SMALL("Mimic"),
 };
--- a/libavcodec/mjpegbdec.c
+++ b/libavcodec/mjpegbdec.c
@ -146,5 +146,5 @@ AVCodec mjpegb_decoder = {
    mjpegb_decode_frame,
    CODEC_CAP_DR1,
    NULL,
-    .long_name = "Apple MJPEG-B",
+    .long_name = NULL_IF_CONFIG_SMALL("Apple MJPEG-B"),
 };
--- a/libavcodec/mjpegdec.c
+++ b/libavcodec/mjpegdec.c
@ -1364,7 +1364,7 @@ AVCodec mjpeg_decoder = {
    ff_mjpeg_decode_frame,
    CODEC_CAP_DR1,
    NULL,
-    .long_name = "MJPEG (Motion JPEG)",
+    .long_name = NULL_IF_CONFIG_SMALL("MJPEG (Motion JPEG)"),
 };

 AVCodec thp_decoder = {
@ -1378,5 +1378,5 @@ AVCodec thp_decoder = {
    ff_mjpeg_decode_frame,
    CODEC_CAP_DR1,
    NULL,
-    .long_name = "Nintendo Gamecube THP video",
+    .long_name = NULL_IF_CONFIG_SMALL("Nintendo Gamecube THP video"),
 };
--- a/libavcodec/mjpegenc.c
+++ b/libavcodec/mjpegenc.c
@ -455,5 +455,5 @@ AVCodec mjpeg_encoder = {
    MPV_encode_picture,
    MPV_encode_end,
    .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUVJ420P, PIX_FMT_YUVJ422P, PIX_FMT_NONE},
-    .long_name= "MJPEG (Motion JPEG)",
+    .long_name= NULL_IF_CONFIG_SMALL("MJPEG (Motion JPEG)"),
 };
--- a/libavcodec/mmvideo.c
+++ b/libavcodec/mmvideo.c
@ -202,5 +202,5 @@ AVCodec mmvideo_decoder = {
    mm_decode_end,
    mm_decode_frame,
    CODEC_CAP_DR1,
-    .long_name = "American Laser Games MM Video",
+    .long_name = NULL_IF_CONFIG_SMALL("American Laser Games MM Video"),
 };
--- a/libavcodec/mpc7.c
+++ b/libavcodec/mpc7.c
@ -273,5 +273,5 @@ AVCodec mpc7_decoder = {
    NULL,
    mpc7_decode_frame,
    .flush = mpc7_decode_flush,
-    .long_name = "Musepack SV7",
+    .long_name = NULL_IF_CONFIG_SMALL("Musepack SV7"),
 };
--- a/libavcodec/mpc8.c
+++ b/libavcodec/mpc8.c
@ -361,5 +361,5 @@ AVCodec mpc8_decoder = {
    NULL,
    NULL,
    mpc8_decode_frame,
-    .long_name = "Musepack SV8",
+    .long_name = NULL_IF_CONFIG_SMALL("Musepack SV8"),
 };
--- a/libavcodec/mpeg12.c
+++ b/libavcodec/mpeg12.c
@ -2445,7 +2445,7 @@ AVCodec mpeg1video_decoder = {
    mpeg_decode_frame,
    CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED | CODEC_CAP_DELAY,
    .flush= ff_mpeg_flush,
-    .long_name= "MPEG-1 video",
+    .long_name= NULL_IF_CONFIG_SMALL("MPEG-1 video"),
 };

 AVCodec mpeg2video_decoder = {
@ -2459,7 +2459,7 @@ AVCodec mpeg2video_decoder = {
    mpeg_decode_frame,
    CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED | CODEC_CAP_DELAY,
    .flush= ff_mpeg_flush,
-    .long_name= "MPEG-2 video",
+    .long_name= NULL_IF_CONFIG_SMALL("MPEG-2 video"),
 };

 //legacy decoder
@ -2474,7 +2474,7 @@ AVCodec mpegvideo_decoder = {
    mpeg_decode_frame,
    CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED | CODEC_CAP_DELAY,
    .flush= ff_mpeg_flush,
-    .long_name= "MPEG-1 video",
+    .long_name= NULL_IF_CONFIG_SMALL("MPEG-1 video"),
 };

 #ifdef HAVE_XVMC
@ -2508,7 +2508,7 @@ AVCodec mpeg_xvmc_decoder = {
    mpeg_decode_frame,
    CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED| CODEC_CAP_HWACCEL | CODEC_CAP_DELAY,
    .flush= ff_mpeg_flush,
-    .long_name = "MPEG-1 video XvMC (X-Video Motion Compensation)",
+    .long_name = NULL_IF_CONFIG_SMALL("MPEG-1 video XvMC (X-Video Motion Compensation)"),
 };

 #endif
--- a/libavcodec/mpeg12enc.c
+++ b/libavcodec/mpeg12enc.c
@ -938,7 +938,7 @@ AVCodec mpeg1video_encoder = {
    .supported_framerates= ff_frame_rate_tab+1,
    .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE},
    .capabilities= CODEC_CAP_DELAY,
-    .long_name= "MPEG-1 video",
+    .long_name= NULL_IF_CONFIG_SMALL("MPEG-1 video"),
 };

 AVCodec mpeg2video_encoder = {
@ -952,5 +952,5 @@ AVCodec mpeg2video_encoder = {
    .supported_framerates= ff_frame_rate_tab+1,
    .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_YUV422P, PIX_FMT_NONE},
    .capabilities= CODEC_CAP_DELAY,
-    .long_name= "MPEG-2 video",
+    .long_name= NULL_IF_CONFIG_SMALL("MPEG-2 video"),
 };
--- a/libavcodec/mpegaudiodec.c
+++ b/libavcodec/mpegaudiodec.c
@ -2640,7 +2640,7 @@ AVCodec mp2_decoder =
    decode_frame,
    CODEC_CAP_PARSE_ONLY,
    .flush= flush,
-    .long_name= "MP2 (MPEG audio layer 2)",
+    .long_name= NULL_IF_CONFIG_SMALL("MP2 (MPEG audio layer 2)"),
 };
 #endif
 #ifdef CONFIG_MP3_DECODER
@ -2656,7 +2656,7 @@ AVCodec mp3_decoder =
    decode_frame,
    CODEC_CAP_PARSE_ONLY,
    .flush= flush,
-    .long_name= "MP3 (MPEG audio layer 3)",
+    .long_name= NULL_IF_CONFIG_SMALL("MP3 (MPEG audio layer 3)"),
 };
 #endif
 #ifdef CONFIG_MP3ADU_DECODER
@ -2672,7 +2672,7 @@ AVCodec mp3adu_decoder =
    decode_frame_adu,
    CODEC_CAP_PARSE_ONLY,
    .flush= flush,
-    .long_name= "ADU (Application Data Unit) MP3 (MPEG audio layer 3)",
+    .long_name= NULL_IF_CONFIG_SMALL("ADU (Application Data Unit) MP3 (MPEG audio layer 3)"),
 };
 #endif
 #ifdef CONFIG_MP3ON4_DECODER
@ -2687,6 +2687,6 @@ AVCodec mp3on4_decoder =
    decode_close_mp3on4,
    decode_frame_mp3on4,
    .flush= flush,
-    .long_name= "MP3onMP4",
+    .long_name= NULL_IF_CONFIG_SMALL("MP3onMP4"),
 };
 #endif
--- a/libavcodec/mpegaudioenc.c
+++ b/libavcodec/mpegaudioenc.c
@ -796,7 +796,7 @@ AVCodec mp2_encoder = {
    MPA_encode_frame,
    MPA_encode_close,
    NULL,
-    .long_name = "MP2 (MPEG audio layer 2)",
+    .long_name = NULL_IF_CONFIG_SMALL("MP2 (MPEG audio layer 2)"),
 };

 #undef FIX
--- a/libavcodec/mpegvideo_enc.c
+++ b/libavcodec/mpegvideo_enc.c
@ -3749,7 +3749,7 @@ AVCodec h263_encoder = {
    MPV_encode_picture,
    MPV_encode_end,
    .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE},
-    .long_name= "H.263",
+    .long_name= NULL_IF_CONFIG_SMALL("H.263"),
 };

 AVCodec h263p_encoder = {
@ -3761,7 +3761,7 @@ AVCodec h263p_encoder = {
    MPV_encode_picture,
    MPV_encode_end,
    .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE},
-    .long_name= "H.263+ / H.263 version 2",
+    .long_name= NULL_IF_CONFIG_SMALL("H.263+ / H.263 version 2"),
 };

 AVCodec flv_encoder = {
@ -3773,7 +3773,7 @@ AVCodec flv_encoder = {
    MPV_encode_picture,
    MPV_encode_end,
    .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE},
-    .long_name= "Flash Video",
+    .long_name= NULL_IF_CONFIG_SMALL("Flash Video"),
 };

 AVCodec rv10_encoder = {
@ -3785,7 +3785,7 @@ AVCodec rv10_encoder = {
    MPV_encode_picture,
    MPV_encode_end,
    .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE},
-    .long_name= "RealVideo 1.0",
+    .long_name= NULL_IF_CONFIG_SMALL("RealVideo 1.0"),
 };

 AVCodec rv20_encoder = {
@ -3797,7 +3797,7 @@ AVCodec rv20_encoder = {
    MPV_encode_picture,
    MPV_encode_end,
    .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE},
-    .long_name= "RealVideo 2.0",
+    .long_name= NULL_IF_CONFIG_SMALL("RealVideo 2.0"),
 };

 AVCodec mpeg4_encoder = {
@ -3810,7 +3810,7 @@ AVCodec mpeg4_encoder = {
    MPV_encode_end,
    .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE},
    .capabilities= CODEC_CAP_DELAY,
-    .long_name= "MPEG-4 part 2",
+    .long_name= NULL_IF_CONFIG_SMALL("MPEG-4 part 2"),
 };

 AVCodec msmpeg4v1_encoder = {
@ -3822,7 +3822,7 @@ AVCodec msmpeg4v1_encoder = {
    MPV_encode_picture,
    MPV_encode_end,
    .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE},
-    .long_name= "MPEG-4 part 2 Microsoft variant version 1",
+    .long_name= NULL_IF_CONFIG_SMALL("MPEG-4 part 2 Microsoft variant version 1"),
 };

 AVCodec msmpeg4v2_encoder = {
@ -3834,7 +3834,7 @@ AVCodec msmpeg4v2_encoder = {
    MPV_encode_picture,
    MPV_encode_end,
    .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE},
-    .long_name= "MPEG-4 part 2 Microsoft variant version 2",
+    .long_name= NULL_IF_CONFIG_SMALL("MPEG-4 part 2 Microsoft variant version 2"),
 };

 AVCodec msmpeg4v3_encoder = {
@ -3846,7 +3846,7 @@ AVCodec msmpeg4v3_encoder = {
    MPV_encode_picture,
    MPV_encode_end,
    .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE},
-    .long_name= "MPEG-4 part 2 Microsoft variant version 3",
+    .long_name= NULL_IF_CONFIG_SMALL("MPEG-4 part 2 Microsoft variant version 3"),
 };

 AVCodec wmv1_encoder = {
@ -3858,5 +3858,5 @@ AVCodec wmv1_encoder = {
    MPV_encode_picture,
    MPV_encode_end,
    .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE},
-    .long_name= "Windows Media Video 7",
+    .long_name= NULL_IF_CONFIG_SMALL("Windows Media Video 7"),
 };
--- a/libavcodec/msrle.c
+++ b/libavcodec/msrle.c
@ -304,5 +304,5 @@ AVCodec msrle_decoder = {
    msrle_decode_end,
    msrle_decode_frame,
    CODEC_CAP_DR1,
-    .long_name= "Microsoft RLE",
+    .long_name= NULL_IF_CONFIG_SMALL("Microsoft RLE"),
 };
--- a/libavcodec/msvideo1.c
+++ b/libavcodec/msvideo1.c
@ -339,5 +339,5 @@ AVCodec msvideo1_decoder = {
    msvideo1_decode_end,
    msvideo1_decode_frame,
    CODEC_CAP_DR1,
-    .long_name= "Microsoft Video 1",
+    .long_name= NULL_IF_CONFIG_SMALL("Microsoft Video 1"),
 };
--- a/libavcodec/nellymoserdec.c
+++ b/libavcodec/nellymoserdec.c
@ -206,6 +206,6 @@ AVCodec nellymoser_decoder = {
    NULL,
    decode_end,
    decode_tag,
-    .long_name = "Nellymoser Asao",
+    .long_name = NULL_IF_CONFIG_SMALL("Nellymoser Asao"),
 };

--- a/libavcodec/nuv.c
+++ b/libavcodec/nuv.c
@ -270,6 +270,6 @@ AVCodec nuv_decoder = {
    decode_end,
    decode_frame,
    CODEC_CAP_DR1,
-    .long_name = "NuppelVideo",
+    .long_name = NULL_IF_CONFIG_SMALL("NuppelVideo"),
 };

--- a/libavcodec/pcm.c
+++ b/libavcodec/pcm.c
@ -530,7 +530,7 @@ AVCodec name ## _encoder = {                    \
    pcm_encode_frame,                           \
    pcm_encode_close,                           \
    NULL,                                       \
-    .long_name = long_name_,                    \
+    .long_name = NULL_IF_CONFIG_SMALL(long_name_), \
 };
 #else
 #define PCM_ENCODER(id,name,long_name_)
@ -547,7 +547,7 @@ AVCodec name ## _decoder = {                    \
    NULL,                                       \
    NULL,                                       \
    pcm_decode_frame,                           \
-    .long_name = long_name_,                    \
+    .long_name = NULL_IF_CONFIG_SMALL(long_name_), \
 };
 #else
 #define PCM_DECODER(id,name,long_name_)
--- a/libavcodec/pcx.c
+++ b/libavcodec/pcx.c
@ -244,5 +244,5 @@ AVCodec pcx_decoder = {
    pcx_decode_frame,
    0,
    NULL,
-    .long_name = "PC Paintbrush PCX image",
+    .long_name = NULL_IF_CONFIG_SMALL("PC Paintbrush PCX image"),
 };
--- a/libavcodec/pngdec.c
+++ b/libavcodec/pngdec.c
@ -618,5 +618,5 @@ AVCodec png_decoder = {
    decode_frame,
    0 /*CODEC_CAP_DR1*/ /*| CODEC_CAP_DRAW_HORIZ_BAND*/,
    NULL,
-    .long_name = "PNG image",
+    .long_name = NULL_IF_CONFIG_SMALL("PNG image"),
 };
--- a/Show More
+++ b/Show More